diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-13 00:39:19 +0200 |
| commit | ca19862d3879dfadfd6c1a1a443eac40fc433385 (patch) | |
| tree | dc114d719849d6c3645063e02378dfddecbc991a /libavcodec/libxvid_rc.c | |
| parent | 5eeecde859ebfa384fbe3c8a1aa62a6b8f6c58e4 (diff) | |
| parent | 18e8fef7c9292041e3266487d9bc6b59e5eaa798 (diff) | |
| download | ffmpeg-ca19862d3879dfadfd6c1a1a443eac40fc433385.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libxvid: remove disabled code
qdm2: make a table static const
qdm2: simplify bitstream reader setup for some subpacket types
qdm2: use get_bits_left()
build: Consistently handle conditional compilation for all optimization OBJS.
avpacket, bfi, bgmc, rawenc: K&R prettyprinting cosmetics
msrle: convert MS RLE decoding function to bytestream2.
x86inc improvements for 64-bit
Conflicts:
common.mak
libavcodec/avpacket.c
libavcodec/bfi.c
libavcodec/msrledec.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libxvid_rc.c')
| -rw-r--r-- | libavcodec/libxvid_rc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/libxvid_rc.c b/libavcodec/libxvid_rc.c index d18fc86eb8..a9a1ee971d 100644 --- a/libavcodec/libxvid_rc.c +++ b/libavcodec/libxvid_rc.c @@ -105,10 +105,6 @@ float ff_xvid_rate_estimate_qscale(MpegEncContext *s, int dry_run){ xvid_plg_data.bquant_offset = 0; // 100 * s->avctx->b_quant_offset; xvid_plg_data.bquant_ratio = 100; // * s->avctx->b_quant_factor; -#if 0 - xvid_plg_data.stats.hlength= X -#endif - if(!s->rc_context.dry_run_qscale){ if(s->picture_number){ xvid_plg_data.length= |