diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 00:49:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-16 01:34:37 +0100 |
| commit | 6cb2085278bdd3ee83d5ed528d98c78756ee7277 (patch) | |
| tree | da57b6491e07c2deb9cf57e3cd595323d118c244 /libavcodec/vp56data.h | |
| parent | 8812c97b98321f82763b7c9c1363c7c1f6cace8f (diff) | |
| parent | 210f72845c11fbab7b913a4f18ffd67e99d2dd4f (diff) | |
| download | ffmpeg-6cb2085278bdd3ee83d5ed528d98c78756ee7277.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (27 commits)
ppc: Add ff_ prefix to nonstatic symbols
sh4: Add ff_ prefix to nonstatic symbols
mpegvideo: Add ff_ prefix to nonstatic functions
rtjpeg: Add ff_ prefix to nonstatic symbols
rv: Add ff_ prefix to nonstatic symbols
vp56: Add ff_ prefix to nonstatic symbols
vorbis: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefix to nonstatic symbols
vc1: Add ff_ prefix to nonstatic symbols
msmpeg4: Add ff_ prefixes to nonstatic symbols
snow: Add ff_ prefix to nonstatic symbols
mpeg12: Add ff_ prefix to nonstatic symbols
mpeg4: Add ff_ prefixes to nonstatic symbols
lagarith: Add ff_ prefix to lag_rac_init
libavcodec: Add ff_ prefix to j_rev_dct*
dsputil: Add ff_ prefix to inv_zigzag_direct16
libavcodec: Prefix fdct_ifast, fdct_ifast248
dsputil: Add ff_ prefix to the dsputil*_init* functions
libavcodec: Add ff_ prefix to some nonstatic symbols
vlc/rl: Add ff_ prefix to the nonstatic symbols
...
Conflicts:
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/nuv.c
libavcodec/ppc/dsputil_ppc.c
libavcodec/proresdsp.c
libavcodec/svq3.c
libavcodec/version.h
libavformat/dv.h
libavformat/dvenc.c
libavformat/matroskadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56data.h')
| -rw-r--r-- | libavcodec/vp56data.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/vp56data.h b/libavcodec/vp56data.h index cb9cf95998..d48a89cbe9 100644 --- a/libavcodec/vp56data.h +++ b/libavcodec/vp56data.h @@ -56,14 +56,14 @@ typedef struct { int8_t prob_idx; } VP56Tree; -extern const uint8_t vp56_b2p[]; -extern const uint8_t vp56_b6to4[]; -extern const uint8_t vp56_coeff_parse_table[6][11]; -extern const uint8_t vp56_def_mb_types_stats[3][10][2]; -extern const VP56Tree vp56_pva_tree[]; -extern const VP56Tree vp56_pc_tree[]; -extern const uint8_t vp56_coeff_bias[]; -extern const uint8_t vp56_coeff_bit_length[]; +extern const uint8_t ff_vp56_b2p[]; +extern const uint8_t ff_vp56_b6to4[]; +extern const uint8_t ff_vp56_coeff_parse_table[6][11]; +extern const uint8_t ff_vp56_def_mb_types_stats[3][10][2]; +extern const VP56Tree ff_vp56_pva_tree[]; +extern const VP56Tree ff_vp56_pc_tree[]; +extern const uint8_t ff_vp56_coeff_bias[]; +extern const uint8_t ff_vp56_coeff_bit_length[]; static const VP56Frame vp56_reference_frame[] = { VP56_FRAME_PREVIOUS, /* VP56_MB_INTER_NOVEC_PF */ |