* 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
Showing the changes to libavcodec/dca_parser.c (1 of 22 files). Show all
Unified · Split
| @@ -24,7 +24,6 @@ · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #include "parser.h" | 25 | #include "parser.h" |
| 26 | #include "dca.h" | 26 | #include "dca.h" |
| 27 | #include "dcadata.h" | ||
| 28 | #include "dca_parser.h" | 27 | #include "dca_parser.h" |
| 29 | #include "get_bits.h" | 28 | #include "get_bits.h" |
| 30 | #include "put_bits.h" | 29 | #include "put_bits.h" |
| @@ -160,7 +159,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration, · 129 unmodified lines | |||
| 160 | 159 | ||
| 161 | skip_bits(&gb, 20); | 160 | skip_bits(&gb, 20); |
| 162 | sr_code = get_bits(&gb, 4); | 161 | sr_code = get_bits(&gb, 4); |
| 163 | *sample_rate = dca_sample_rates[sr_code]; | 162 | *sample_rate = avpriv_dca_sample_rates[sr_code]; |
| 164 | if (*sample_rate == 0) | 163 | if (*sample_rate == 0) |
| 165 | return AVERROR_INVALIDDATA; | 164 | return AVERROR_INVALIDDATA; |
| 166 | 165 | ||