diff options
| author | Christophe Massiot <cmassiot@freebox.fr> | 2004-07-20 17:13:08 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-07-20 17:13:08 +0000 |
| commit | f1dc14a9fa364fa0532bc38103cfaab6d4161da8 (patch) | |
| tree | 51a6db78bf2be50e9149ca1e27c56c58b18e8e43 | |
| parent | d4fcd7c61afe2e997655e7b660c674a3311bfd1e (diff) | |
| download | ffmpeg-f1dc14a9fa364fa0532bc38103cfaab6d4161da8.tar.gz | |
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
| -rw-r--r-- | libavcodec/mpegvideo.c | 1 |
1 files changed, 0 insertions, 1 deletions
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); |