diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 21:58:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-08 22:00:09 +0200 |
| commit | d5a3caef93026abebaa73f4b9c747004a1457fd7 (patch) | |
| tree | dc24d134264dcc61fd87a0a8779abf3224c0eef0 /libavcodec/vc1data.h | |
| parent | 9da679e77fa25487ae37db11f010fde68034e362 (diff) | |
| parent | 04d14c9b68b03e8dbc6e3003c1ee06892dd32576 (diff) | |
| download | ffmpeg-d5a3caef93026abebaa73f4b9c747004a1457fd7.tar.gz | |
Merge commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576'
* commit '04d14c9b68b03e8dbc6e3003c1ee06892dd32576':
vc1: Split the decoder in components
Conflicts:
libavcodec/Makefile
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1data.h')
| -rw-r--r-- | libavcodec/vc1data.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h index eecb0457f3..763cd48a60 100644 --- a/libavcodec/vc1data.h +++ b/libavcodec/vc1data.h @@ -94,8 +94,6 @@ extern VLC ff_vc1_ac_coeff_table[8]; #define VC1_IF_MBMODE_VLC_BITS 5 //@} - -/* Denominator used for ff_vc1_bfraction_lut */ #define B_FRACTION_DEN 256 /* pre-computed scales for all bfractions and base=256 */ |