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 /libavformat/spdifenc.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 'libavformat/spdifenc.c')
| -rw-r--r-- | libavformat/spdifenc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 13b91e4750..da688aa393 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -49,7 +49,6 @@ #include "spdif.h" #include "libavcodec/ac3.h" #include "libavcodec/dca.h" -#include "libavcodec/dcadata.h" #include "libavcodec/aacadtsdec.h" #include "libavutil/opt.h" @@ -253,7 +252,7 @@ static int spdif_header_dts(AVFormatContext *s, AVPacket *pkt) case DCA_MARKER_RAW_BE: blocks = (AV_RB16(pkt->data + 4) >> 2) & 0x7f; core_size = ((AV_RB24(pkt->data + 5) >> 4) & 0x3fff) + 1; - sample_rate = dca_sample_rates[(pkt->data[8] >> 2) & 0x0f]; + sample_rate = avpriv_dca_sample_rates[(pkt->data[8] >> 2) & 0x0f]; break; case DCA_MARKER_RAW_LE: blocks = (AV_RL16(pkt->data + 4) >> 2) & 0x7f; |