aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg4data.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-02-16 00:49:16 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-02-16 01:34:37 +0100
commit6cb2085278bdd3ee83d5ed528d98c78756ee7277 (patch)
treeda57b6491e07c2deb9cf57e3cd595323d118c244 /libavcodec/mpeg4data.h
parent8812c97b98321f82763b7c9c1363c7c1f6cace8f (diff)
parent210f72845c11fbab7b913a4f18ffd67e99d2dd4f (diff)
downloadffmpeg-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/mpeg4data.h')
-rw-r--r--libavcodec/mpeg4data.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpeg4data.h b/libavcodec/mpeg4data.h
index 1f4e578ca1..1ac5840e03 100644
--- a/libavcodec/mpeg4data.h
+++ b/libavcodec/mpeg4data.h
@@ -211,7 +211,7 @@ static const int8_t inter_rvlc_level[169]={
1, 1,
};
-RLTable rvlc_rl_inter = {
+RLTable ff_rvlc_rl_inter = {
169,
103,
inter_rvlc,
@@ -315,7 +315,7 @@ static const int8_t intra_rvlc_level[169]={
1, 1,
};
-RLTable rvlc_rl_intra = {
+RLTable ff_rvlc_rl_intra = {
169,
103,
intra_rvlc,
@@ -323,13 +323,13 @@ RLTable rvlc_rl_intra = {
intra_rvlc_level,
};
-const uint16_t sprite_trajectory_tab[15][2] = {
+const uint16_t ff_sprite_trajectory_tab[15][2] = {
{0x00, 2}, {0x02, 3}, {0x03, 3}, {0x04, 3}, {0x05, 3}, {0x06, 3},
{0x0E, 4}, {0x1E, 5}, {0x3E, 6}, {0x7E, 7}, {0xFE, 8},
{0x1FE, 9},{0x3FE, 10},{0x7FE, 11},{0xFFE, 12},
};
-const uint8_t mb_type_b_tab[4][2] = {
+const uint8_t ff_mb_type_b_tab[4][2] = {
{1, 1}, {1, 2}, {1, 3}, {1, 4},
};
@@ -369,7 +369,7 @@ const uint16_t ff_mpeg4_resync_prefix[8]={
0x7F00, 0x7E00, 0x7C00, 0x7800, 0x7000, 0x6000, 0x4000, 0x0000
};
-const uint8_t mpeg4_dc_threshold[8]={
+const uint8_t ff_mpeg4_dc_threshold[8]={
99, 13, 15, 17, 19, 21, 23, 0
};