ffmpeg | branch: master | Matthieu Bouron <matthieu.bou...@stupeflix.com> | Mon Jun 20 16:30:21 2016 +0200| [30e3a27119294f7353c7a1e6d6387dbef792c203] | committer: Matthieu Bouron
lavc/mediacodec: re-indent after previous commit > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=30e3a27119294f7353c7a1e6d6387dbef792c203 --- libavcodec/mediacodecdec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/mediacodecdec.c b/libavcodec/mediacodecdec.c index 6b7cdb4..75933fc 100644 --- a/libavcodec/mediacodecdec.c +++ b/libavcodec/mediacodecdec.c @@ -475,20 +475,20 @@ int ff_mediacodec_dec_decode(AVCodecContext *avctx, MediaCodecDecContext *s, info.presentationTimeUs, info.flags); if (info.size) { - data = ff_AMediaCodec_getOutputBuffer(codec, index, &size); - if (!data) { - av_log(avctx, AV_LOG_ERROR, "Failed to get output buffer\n"); - return AVERROR_EXTERNAL; - } + data = ff_AMediaCodec_getOutputBuffer(codec, index, &size); + if (!data) { + av_log(avctx, AV_LOG_ERROR, "Failed to get output buffer\n"); + return AVERROR_EXTERNAL; + } - if ((ret = mediacodec_wrap_buffer(avctx, s, data, size, index, &info, frame)) < 0) { - av_log(avctx, AV_LOG_ERROR, "Failed to wrap MediaCodec buffer\n"); - return ret; - } + if ((ret = mediacodec_wrap_buffer(avctx, s, data, size, index, &info, frame)) < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to wrap MediaCodec buffer\n"); + return ret; + } - *got_frame = 1; - s->queued_buffer_nb--; - s->dequeued_buffer_nb++; + *got_frame = 1; + s->queued_buffer_nb--; + s->dequeued_buffer_nb++; } else { status = ff_AMediaCodec_releaseOutputBuffer(codec, index, 0); if (status < 0) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
