aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthieu Bouron <matthieu.bouron@gmail.com>2019-04-24 09:59:29 +0200
committerMatthieu Bouron <matthieu.bouron@gmail.com>2019-06-13 11:41:18 +0200
commitfef5ba40231db053afd611874ebbadbead6cbf8e (patch)
tree3fa13a8343145de2c66b76fd739b70dfed9a5e2c
parentd83985ce11d0f68d293e52fdccfc62fe9d28d54f (diff)
downloadffmpeg-fef5ba40231db053afd611874ebbadbead6cbf8e.tar.gz
avcodec/mediacodecdec: remove unneeded else block in ff_mediacodec_dec_send()
-rw-r--r--libavcodec/mediacodecdec_common.c4
1 files 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)