diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-17 19:52:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-17 20:12:02 +0200 |
| commit | 78accb876c173c881082018b169b5cf9fa13e6e1 (patch) | |
| tree | 5dbcaf2ae14a012dafaaf418a650d697f3ef8ea4 /libavcodec/vc1data.h | |
| parent | fc096e2e861e821a743bf9c42abee0fb41fff5d6 (diff) | |
| parent | 08e09ed7db732ebc53b8c60d7a39ac0abd49694f (diff) | |
| download | ffmpeg-78accb876c173c881082018b169b5cf9fa13e6e1.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ffmpeg: fix some indentation
ffmpeg: fix operation with --disable-avfilter
simple_idct: remove disabled code
motion_est: remove disabled code
vc1: remove disabled code
fate: separate lavf-mxf_d10 test from lavf-mxf
cabac: Move code only used in the cabac test program to cabac.c.
ffplay: warn that -pix_fmt is no longer working, suggest alternative
ffplay: warn that -s is no longer working, suggest alternative
lavf: rename enc variable in utils.c:has_codec_parameters()
lavf: use designated initialisers for all (de)muxers.
wav: remove a use of deprecated AV_METADATA_ macro
rmdec: remove useless ap parameter from rm_read_header_old()
dct-test: remove write-only variable
des: fix #if conditional around P_shuffle
Use LOCAL_ALIGNED in ff_check_alignment()
Conflicts:
ffmpeg.c
libavformat/avidec.c
libavformat/matroskaenc.c
libavformat/mp3enc.c
libavformat/oggenc.c
libavformat/utils.c
tests/ref/lavf/mxf
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1data.h')
| -rw-r--r-- | libavcodec/vc1data.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h index 934627a781..0a821f9a90 100644 --- a/libavcodec/vc1data.h +++ b/libavcodec/vc1data.h @@ -74,20 +74,11 @@ extern VLC ff_vc1_ac_coeff_table[8]; //@} -#if 0 //original bfraction from vc9data.h, not conforming to standard -/* Denominator used for ff_vc1_bfraction_lut */ -#define B_FRACTION_DEN 840 - -/* bfraction is fractional, we scale to the GCD 3*5*7*8 = 840 */ -extern const int16_t ff_vc1_bfraction_lut[23]; -#else /* Denominator used for ff_vc1_bfraction_lut */ #define B_FRACTION_DEN 256 /* pre-computed scales for all bfractions and base=256 */ extern const int16_t ff_vc1_bfraction_lut[23]; -#endif - extern const uint8_t ff_vc1_bfraction_bits[23]; extern const uint8_t ff_vc1_bfraction_codes[23]; |