avs: fix infinite loop on end-of-stream.
authorRonald S. Bultje <rsbultje@gmail.com>
Thu, 16 Feb 2012 00:21:34 +0000 (16:21 -0800)
committerReinhard Tartler <siretart@tauware.de>
Tue, 13 Mar 2012 22:36:02 +0000 (23:36 +0100)
The codec would keep returning the last decoded frame if the stream
contains B-frames, since it wouldn't clear that frame from the list of
frames to be returned to the user.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 83f15a1228895434a982c840b09edccd1c64e800)

Conflicts:

libavcodec/cavsdec.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
libavcodec/cavsdec.c

index 2f4b6e3..b0e517b 100644 (file)
@@ -655,7 +655,8 @@ static int cavs_decode_frame(AVCodecContext * avctx,void *data, int *data_size,
     if (buf_size == 0) {
         if (!s->low_delay && h->DPB[0].f.data[0]) {
             *data_size = sizeof(AVPicture);
-            *picture = *(AVFrame *) &h->DPB[0];
+            *picture = h->DPB[0].f;
+            memset(&h->DPB[0], 0, sizeof(h->DPB[0]));
         }
         return 0;
     }