diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-26 22:24:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-26 22:24:58 +0200 |
| commit | e890b689628634d75e093b24ae257b008fc85443 (patch) | |
| tree | af2189297e3da55438dc0e968633a8a2806fb5fd /libavformat/isom.c | |
| parent | f1f5b39866c4deb7800aa9288010cdbd386da477 (diff) | |
| parent | 0a07f2b346433a9a2677c69c6b29a1a827e39109 (diff) | |
| download | ffmpeg-e890b689628634d75e093b24ae257b008fc85443.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: fix invalid array indexing
configure: add libavresample to rpath
build: icc: silence some warnings
fft-test: add option to set cpuflag mask
cpu: recognise only cpu flag names pertinent to the architecture
avutil: add av_parse_cpu_flags() function
vp8: armv6: fix non-armv6t2 build
vp8: armv6 optimisations
vp8: arm: separate ARMv6 functions from NEON
ARM: add some compatibility macros
mov: support eac3 audio
avf: fix faulty check in has_duration
Conflicts:
configure
doc/APIchanges
ffmpeg.c
libavcodec/arm/Makefile
libavcodec/arm/asm.S
libavcodec/arm/vp8dsp_armv6.S
libavcodec/arm/vp8dsp_init_arm.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/isom.c')
| -rw-r--r-- | libavformat/isom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 44ec507770..ba2cce74b8 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -249,6 +249,7 @@ const AVCodecTag ff_codec_movaudio_tags[] = { { CODEC_ID_DTS, MKTAG('d', 't', 's', 'h') }, /* DTS-HD audio formats */ { CODEC_ID_DTS, MKTAG('d', 't', 's', 'l') }, /* DTS-HD Lossless formats */ { CODEC_ID_DTS, MKTAG('D', 'T', 'S', ' ') }, /* non-standard */ + { CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F (only valid in ISOBMFF) */ { CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') }, { CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') }, { CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F */ |