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/vc1data.h | |
| parent | 8812c97b98321f82763b7c9c1363c7c1f6cace8f (diff) | |
| parent | 210f72845c11fbab7b913a4f18ffd67e99d2dd4f (diff) | |
| download | android_external_ffmpeg-6cb2085278bdd3ee83d5ed528d98c78756ee7277.tar.gz android_external_ffmpeg-6cb2085278bdd3ee83d5ed528d98c78756ee7277.tar.bz2 android_external_ffmpeg-6cb2085278bdd3ee83d5ed528d98c78756ee7277.zip | |
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/vc1data.h')
| -rw-r--r-- | libavcodec/vc1data.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h index f11122504b..c9fedc1557 100644 --- a/libavcodec/vc1data.h +++ b/libavcodec/vc1data.h @@ -126,7 +126,7 @@ extern const uint8_t ff_vc1_4mv_block_pattern_bits[4][16]; extern const uint8_t ff_vc1_2mv_block_pattern_codes[4][4]; extern const uint8_t ff_vc1_2mv_block_pattern_bits[4][4]; -extern const uint8_t wmv3_dc_scale_table[32]; +extern const uint8_t ff_wmv3_dc_scale_table[32]; /* P-Picture CBPCY VLC tables */ extern const uint16_t ff_vc1_cbpcy_p_codes[4][64]; @@ -197,7 +197,7 @@ extern const int8_t ff_vc1_intra_vert_8x8_zz [64]; extern const int32_t ff_vc1_dqscale[63]; /* P Interlaced field picture MV predictor scaling values (Table 114) */ -extern const uint16_t vc1_field_mvpred_scales[2][7][4]; +extern const uint16_t ff_vc1_field_mvpred_scales[2][7][4]; /* B Interlaced field picture backward MV predictor scaling values for first field (Table 115) */ -extern const uint16_t vc1_b_field_mvpred_scales[7][4]; +extern const uint16_t ff_vc1_b_field_mvpred_scales[7][4]; #endif /* AVCODEC_VC1DATA_H */ |