[SCM] libav/experimental: Reset frame_num for MMCO 5. Fixes at least MR2_TANDBERG_E.264

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e44e48372ba8d3eac2ec0340cc2a883aa9786a59
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Tue Jul 22 19:30:45 2008 +0000

    Reset frame_num for MMCO 5.
    Fixes at least
    MR2_TANDBERG_E.264
    
    Originally committed as revision 14338 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a2e161d..0236eb4 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3539,6 +3539,7 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
                 pic= remove_long(h, j);
                 if(pic) unreference_pic(h, pic, 0);
             }
+            s->current_picture_ptr->frame_num= 0;
             break;
         default: assert(0);
         }

-- 
Libav/FFmpeg packaging