diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 20:24:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-02 20:24:02 +0100 |
| commit | b58c1dd63268e6805fd3423bdecb8f4530e1cae2 (patch) | |
| tree | f5103eae89c6f802faf1fd7887872e7567caf81c /libavcodec/dv.c | |
| parent | 6f9be8120d2933268733eded5d6c0eb92341e788 (diff) | |
| parent | 21710ea82118c9d19bea9277b2a85a33096fdd95 (diff) | |
| download | ffmpeg-b58c1dd63268e6805fd3423bdecb8f4530e1cae2.tar.gz | |
Merge commit '21710ea82118c9d19bea9277b2a85a33096fdd95'
* commit '21710ea82118c9d19bea9277b2a85a33096fdd95':
dv: Move DV VLC data tables out of header file
Conflicts:
libavcodec/dv_vlc_data.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv.c')
| -rw-r--r-- | libavcodec/dv.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 14684098d2..ebb56bd84d 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -255,20 +255,20 @@ av_cold int ff_dvvideo_init(AVCodecContext *avctx) /* it's faster to include sign bit in a generic VLC parsing scheme */ for (i = 0, j = 0; i < NB_DV_VLC; i++, j++) { - new_dv_vlc_bits[j] = dv_vlc_bits[i]; - new_dv_vlc_len[j] = dv_vlc_len[i]; - new_dv_vlc_run[j] = dv_vlc_run[i]; - new_dv_vlc_level[j] = dv_vlc_level[i]; + new_dv_vlc_bits[j] = ff_dv_vlc_bits[i]; + new_dv_vlc_len[j] = ff_dv_vlc_len[i]; + new_dv_vlc_run[j] = ff_dv_vlc_run[i]; + new_dv_vlc_level[j] = ff_dv_vlc_level[i]; - if (dv_vlc_level[i]) { + if (ff_dv_vlc_level[i]) { new_dv_vlc_bits[j] <<= 1; new_dv_vlc_len[j]++; j++; - new_dv_vlc_bits[j] = (dv_vlc_bits[i] << 1) | 1; - new_dv_vlc_len[j] = dv_vlc_len[i] + 1; - new_dv_vlc_run[j] = dv_vlc_run[i]; - new_dv_vlc_level[j] = -dv_vlc_level[i]; + new_dv_vlc_bits[j] = (ff_dv_vlc_bits[i] << 1) | 1; + new_dv_vlc_len[j] = ff_dv_vlc_len[i] + 1; + new_dv_vlc_run[j] = ff_dv_vlc_run[i]; + new_dv_vlc_level[j] = -ff_dv_vlc_level[i]; } } |