[SCM] libav/experimental: Fix MB skipping with droppable frames. Fixes issue323.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5b0e7dacd83580a9a4faf0535606fcf47844ee1d
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun May 25 14:07:35 2008 +0000

    Fix MB skipping with droppable frames.
    Fixes issue323.
    
    Originally committed as revision 13378 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 4faf85f..7a2deae 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -236,7 +236,7 @@ int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
     /* It might be nicer if the application would keep track of these
      * but it would require an API change. */
     memmove(s->prev_pict_types+1, s->prev_pict_types, PREV_PICT_TYPES_BUFFER_SIZE-1);
-    s->prev_pict_types[0]= s->pict_type;
+    s->prev_pict_types[0]= s->dropable ? FF_B_TYPE : s->pict_type;
     if(pic->age < PREV_PICT_TYPES_BUFFER_SIZE && s->prev_pict_types[pic->age] == FF_B_TYPE)
         pic->age= INT_MAX; // Skipped MBs in B-frames are quite rare in MPEG-1/2 and it is a bit tricky to skip them anyway.
 

-- 
Libav/FFmpeg packaging