miscalculation of header_bits when using the -thread option bugfix, patch by...

miscalculation of header_bits when using the -thread option bugfix, patch by (Christophe Massiot <cmassiot at freebox dot fr>)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3329 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavcodec/mpegvideo.c

@@ -4652,7 +4652,6 @@ static void merge_context_after_encode(MpegEncContext *dst, MpegEncContext *src)
     MERGE(dct_count[0]); //note, the other dct vars are not part of the context
     MERGE(dct_count[1]);
     MERGE(mv_bits);
-    MERGE(header_bits);
     MERGE(i_tex_bits);
     MERGE(p_tex_bits);
     MERGE(i_count);