ffmpeg | branch: master | Matthieu Bouron <matthieu.bou...@gmail.com> | Wed Apr 24 09:59:29 2019 +0200| [fef5ba40231db053afd611874ebbadbead6cbf8e] | committer: Matthieu Bouron
avcodec/mediacodecdec: remove unneeded else block in ff_mediacodec_dec_send() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fef5ba40231db053afd611874ebbadbead6cbf8e --- libavcodec/mediacodecdec_common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c index f7a06cdc6d..f90e2f1a23 100644 --- a/libavcodec/mediacodecdec_common.c +++ b/libavcodec/mediacodecdec_common.c @@ -632,7 +632,8 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, s->draining = 1; return 0; - } else { + } + size = FFMIN(pkt->size - offset, size); memcpy(data, pkt->data + offset, size); offset += size; @@ -645,7 +646,6 @@ int ff_mediacodec_dec_send(AVCodecContext *avctx, MediaCodecDecContext *s, av_log(avctx, AV_LOG_TRACE, "Queued input buffer %zd size=%zd ts=%"PRIi64"\n", index, size, pts); - } } if (offset == 0) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".