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/sh4 | |
parent | 8812c97b98321f82763b7c9c1363c7c1f6cace8f (diff) | |
parent | 210f72845c11fbab7b913a4f18ffd67e99d2dd4f (diff) | |
download | ffmpeg-streaming-6cb2085278bdd3ee83d5ed528d98c78756ee7277.zip ffmpeg-streaming-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/sh4')
-rw-r--r-- | libavcodec/sh4/dsputil_align.c | 2 | ||||
-rw-r--r-- | libavcodec/sh4/dsputil_sh4.c | 10 | ||||
-rw-r--r-- | libavcodec/sh4/dsputil_sh4.h | 4 | ||||
-rw-r--r-- | libavcodec/sh4/idct_sh4.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/sh4/dsputil_align.c b/libavcodec/sh4/dsputil_align.c index e918936..a545e55 100644 --- a/libavcodec/sh4/dsputil_align.c +++ b/libavcodec/sh4/dsputil_align.c @@ -331,7 +331,7 @@ DEFFUNC(avg,no_rnd,xy,16,OP_XY,PACK) #endif -void dsputil_init_align(DSPContext* c, AVCodecContext *avctx) +void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx) { const int high_bit_depth = avctx->bits_per_raw_sample > 8; diff --git a/libavcodec/sh4/dsputil_sh4.c b/libavcodec/sh4/dsputil_sh4.c index 905e8b1..7deab41 100644 --- a/libavcodec/sh4/dsputil_sh4.c +++ b/libavcodec/sh4/dsputil_sh4.c @@ -56,7 +56,7 @@ static void idct_put(uint8_t *dest, int line_size, DCTELEM *block) { int i; uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; - idct_sh4(block); + ff_idct_sh4(block); for(i=0;i<8;i++) { dest[0] = cm[block[0]]; dest[1] = cm[block[1]]; @@ -74,7 +74,7 @@ static void idct_add(uint8_t *dest, int line_size, DCTELEM *block) { int i; uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; - idct_sh4(block); + ff_idct_sh4(block); for(i=0;i<8;i++) { dest[0] = cm[dest[0]+block[0]]; dest[1] = cm[dest[1]+block[1]]; @@ -89,11 +89,11 @@ static void idct_add(uint8_t *dest, int line_size, DCTELEM *block) } } -void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx) +void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx) { const int idct_algo= avctx->idct_algo; const int high_bit_depth = avctx->bits_per_raw_sample > 8; - dsputil_init_align(c,avctx); + ff_dsputil_init_align(c,avctx); if (!high_bit_depth) c->clear_blocks = clear_blocks_sh4; @@ -101,7 +101,7 @@ void dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx) (idct_algo==FF_IDCT_AUTO || idct_algo==FF_IDCT_SH4)) { c->idct_put = idct_put; c->idct_add = idct_add; - c->idct = idct_sh4; + c->idct = ff_idct_sh4; c->idct_permutation_type= FF_NO_IDCT_PERM; } } diff --git a/libavcodec/sh4/dsputil_sh4.h b/libavcodec/sh4/dsputil_sh4.h index 2e554e7..f2cb11e 100644 --- a/libavcodec/sh4/dsputil_sh4.h +++ b/libavcodec/sh4/dsputil_sh4.h @@ -22,7 +22,7 @@ #include "libavcodec/avcodec.h" #include "libavcodec/dsputil.h" -void idct_sh4(DCTELEM *block); -void dsputil_init_align(DSPContext* c, AVCodecContext *avctx); +void ff_idct_sh4(DCTELEM *block); +void ff_dsputil_init_align(DSPContext* c, AVCodecContext *avctx); #endif /* AVCODEC_SH4_DSPUTIL_SH4_H */ diff --git a/libavcodec/sh4/idct_sh4.c b/libavcodec/sh4/idct_sh4.c index 13a85b0..e54c330 100644 --- a/libavcodec/sh4/idct_sh4.c +++ b/libavcodec/sh4/idct_sh4.c @@ -89,7 +89,7 @@ static const float odd_table[] __attribute__ ((aligned(8))) = { //optimized -void idct_sh4(DCTELEM *block) +void ff_idct_sh4(DCTELEM *block) { DEFREG; |