[FFmpeg-cvslog] MPV: always mark dummy frames as reference

Janne Grunau git at videolan.org
Sat Mar 17 23:52:39 CET 2012


ffmpeg | branch: master | Janne Grunau <janne-libav at jannau.net> | Fri Mar 16 14:08:17 2012 +0100| [7b60799aa8ebd7115e883d8eb404061e42a59f85] | committer: Janne Grunau

MPV: always mark dummy frames as reference

If the dummy frame are not created from a reference frame they could
be deleted untimely resulting in multithreaded decoder waiting on
the current frame to finish.
Noticed by Ronald S. Bultje in the RV34 decoder with a broken file.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b60799aa8ebd7115e883d8eb404061e42a59f85
---

 libavcodec/mpegvideo.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index a239a6a..720997f 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1271,6 +1271,7 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
                 return -1;
             ff_thread_report_progress(&s->last_picture_ptr->f, INT_MAX, 0);
             ff_thread_report_progress(&s->last_picture_ptr->f, INT_MAX, 1);
+            s->last_picture_ptr->f.reference = 3;
         }
         if ((s->next_picture_ptr == NULL ||
              s->next_picture_ptr->f.data[0] == NULL) &&
@@ -1282,6 +1283,7 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
                 return -1;
             ff_thread_report_progress(&s->next_picture_ptr->f, INT_MAX, 0);
             ff_thread_report_progress(&s->next_picture_ptr->f, INT_MAX, 1);
+            s->next_picture_ptr->f.reference = 3;
         }
     }
 



More information about the ffmpeg-cvslog mailing list