From f1dc14a9fa364fa0532bc38103cfaab6d4161da8 Mon Sep 17 00:00:00 2001
From: Christophe Massiot <cmassiot@freebox.fr>
Date: Tue, 20 Jul 2004 17:13:08 +0000
Subject: [PATCH] miscalculation of header_bits when using the -thread option
 bugfix, patch by (Christophe Massiot <cmassiot at freebox dot fr>)

Originally committed as revision 3329 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/mpegvideo.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 3e7ac798d6..88251a49a3 100644
--- a/libavcodec/mpegvideo.c
+++ b/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);