diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 23:33:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-01 23:33:06 +0200 |
| commit | ec7ecb88117fd2d086f0be45ded9743c94100ef4 (patch) | |
| tree | 8536e70dd413e0dc1c5cd65dec3c37928ef3b8cc /libavcodec/dcaenc.c | |
| parent | 4c8fc6a2a41d1b8a4d3eb4452bb5d728253273f4 (diff) | |
| parent | 19cf7163c1576e7b03ea33d7bf633e14d7516db8 (diff) | |
| download | ffmpeg-ec7ecb88117fd2d086f0be45ded9743c94100ef4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
ARM: use =const syntax instead of explicit literal pools
ARM: use standard syntax for all LDRD/STRD instructions
fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
dct-test: allow to compile without HAVE_INLINE_ASM.
x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.
dca: Move tables used outside of dcadec.c to a separate file.
dca: Rename dca.c ---> dcadec.c
x86: h264dsp: Remove unused variable ff_pb_3_1
apetag: change a forgotten return to return 0
Conflicts:
libavcodec/Makefile
libavcodec/dca.c
libavcodec/x86/fft_3dn.c
libavcodec/x86/fft_3dn2.c
libavcodec/x86/fft_mmx.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dcaenc.c')
| -rw-r--r-- | libavcodec/dcaenc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c index 6879321eb3..fd00b4f0b1 100644 --- a/libavcodec/dcaenc.c +++ b/libavcodec/dcaenc.c @@ -30,6 +30,7 @@ #include "put_bits.h" #include "dcaenc.h" #include "dcadata.h" +#include "dca.h" #undef NDEBUG @@ -569,13 +570,13 @@ static int encode_init(AVCodecContext *avctx) } for (i = 0; i < 16; i++) { - if (dca_sample_rates[i] && (dca_sample_rates[i] == avctx->sample_rate)) + if (avpriv_dca_sample_rates[i] && (avpriv_dca_sample_rates[i] == avctx->sample_rate)) break; } if (i == 16) { av_log(avctx, AV_LOG_ERROR, "Sample rate %iHz not supported, only ", avctx->sample_rate); for (i = 0; i < 16; i++) - av_log(avctx, AV_LOG_ERROR, "%d, ", dca_sample_rates[i]); + av_log(avctx, AV_LOG_ERROR, "%d, ", avpriv_dca_sample_rates[i]); av_log(avctx, AV_LOG_ERROR, "supported.\n"); return -1; } |