[SCM] libav/master: mpegvideo: set reference/pict_type on generated reference frames

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit c9be276f8b040e7d441a77f774afe94b6f137be6
Author: Anton Khirnov <anton at khirnov.net>
Date:   Thu Nov 28 10:54:35 2013 +0100

    mpegvideo: set reference/pict_type on generated reference frames
    
    Otherwise the generic code will unref them, which can then result in
    last_picture_ptr == current_picture_ptr, which causes deadlocks at least
    in rv40.
    
    Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
    CC:libav-stable at libav.org

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index eb71670..c3d799d 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -1481,6 +1481,10 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
                 return i;
             }
             s->last_picture_ptr = &s->picture[i];
+
+            s->last_picture_ptr->f.reference   = 3;
+            s->last_picture_ptr->f.pict_type = AV_PICTURE_TYPE_I;
+
             if (ff_alloc_picture(s, s->last_picture_ptr, 0) < 0) {
                 s->last_picture_ptr = NULL;
                 return -1;
@@ -1499,6 +1503,10 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
                 return i;
             }
             s->next_picture_ptr = &s->picture[i];
+
+            s->next_picture_ptr->f.reference   = 3;
+            s->next_picture_ptr->f.pict_type = AV_PICTURE_TYPE_I;
+
             if (ff_alloc_picture(s, s->next_picture_ptr, 0) < 0) {
                 s->next_picture_ptr = NULL;
                 return -1;

-- 
Libav/FFmpeg packaging