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_tablegen.h | |
| parent | 6f9be8120d2933268733eded5d6c0eb92341e788 (diff) | |
| parent | 21710ea82118c9d19bea9277b2a85a33096fdd95 (diff) | |
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_tablegen.h')
| -rw-r--r-- | libavcodec/dv_tablegen.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h index e8cdc21dcf..c04b802290 100644 --- a/libavcodec/dv_tablegen.h +++ b/libavcodec/dv_tablegen.h @@ -25,7 +25,7 @@ #include <stdint.h> -#include "dv_vlc_data.h" +#include "dvdata.h" #if CONFIG_SMALL #define DV_VLC_MAP_RUN_SIZE 15 @@ -51,20 +51,20 @@ static void dv_vlc_map_tableinit(void) { int i, j; for (i = 0; i < NB_DV_VLC - 1; i++) { - if (dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) + if (ff_dv_vlc_run[i] >= DV_VLC_MAP_RUN_SIZE) continue; #if CONFIG_SMALL - if (dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) + if (ff_dv_vlc_level[i] >= DV_VLC_MAP_LEV_SIZE) continue; #endif - if (dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size != 0) + if (dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size != 0) continue; - dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].vlc = - dv_vlc_bits[i] << (!!dv_vlc_level[i]); - dv_vlc_map[dv_vlc_run[i]][dv_vlc_level[i]].size = - dv_vlc_len[i] + (!!dv_vlc_level[i]); + dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].vlc = + ff_dv_vlc_bits[i] << (!!ff_dv_vlc_level[i]); + dv_vlc_map[ff_dv_vlc_run[i]][ff_dv_vlc_level[i]].size = + ff_dv_vlc_len[i] + (!!ff_dv_vlc_level[i]); } for (i = 0; i < DV_VLC_MAP_RUN_SIZE; i++) { #if CONFIG_SMALL |