Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'

[ffmpeg] / libavcodec / utils.c

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 8695cb968947e7f5abfbf3404ccdbc82018a37a6..558afebc2f10d472c1df57d671c64c0e2883a835 100644 (file)
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -2539,6 +2539,7 @@ int attribute_align_arg avcodec_decode_audio4(AVCodecContext *avctx,
             ret = ff_thread_decode_frame(avctx, frame, got_frame_ptr, &tmp);
         else {
             ret = avctx->codec->decode(avctx, frame, got_frame_ptr, &tmp);
+            av_assert0(ret <= tmp.size);
             frame->pkt_dts = avpkt->dts;
         }
         if (ret >= 0 && *got_frame_ptr) {