[SCM] libav/experimental: Count non-header data towards intra block bit count in MJPEG encoder

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 23b8342af413c447ef9c4c0e0f645833b96fd1bf
Author: Bobby Bingham <uhmmmm at gmail.com>
Date:   Sat Dec 4 05:21:03 2010 +0000

    Count non-header data towards intra block bit count in MJPEG encoder
    
    Originally committed as revision 25873 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c
index ec819c8..05f0bed 100644
--- a/libavcodec/mjpegenc.c
+++ b/libavcodec/mjpegenc.c
@@ -441,6 +441,8 @@ void ff_mjpeg_encode_mb(MpegEncContext *s, DCTELEM block[6][64])
         encode_block(s, block[5], 5);
         encode_block(s, block[7], 7);
     }
+
+    s->i_tex_bits += get_bits_diff(s);
 }
 
 AVCodec mjpeg_encoder = {

-- 
Libav/FFmpeg packaging