aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-24 23:44:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-24 23:45:09 +0200
commit8f899545502c287653223ca27522c4abcd3a2e91 (patch)
tree1b633d81c6104786d65ef05c6da1426bbead30e1 /libavformat
parentfe5bc46f60c0ebd82593999520ebff1d230b0483 (diff)
parent8c4022aceb68558df655059cef4d570625dc1d09 (diff)
downloadffmpeg-8f899545502c287653223ca27522c4abcd3a2e91.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: avconv: fix a segfault on -c copy with -filter_complex. isom: Support more DTS codec identifiers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/isom.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 34daeaeeeb..44ec507770 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -245,7 +245,9 @@ const AVCodecTag ff_codec_movaudio_tags[] = {
{ CODEC_ID_ALAC, MKTAG('a', 'l', 'a', 'c') },
{ CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */
{ CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */
- { CODEC_ID_DTS, MKTAG('d', 't', 's', 'c') }, /* mp4ra.org */
+ { CODEC_ID_DTS, MKTAG('d', 't', 's', 'c') }, /* DTS formats prior to DTS-HD */
+ { 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_DVAUDIO, MKTAG('v', 'd', 'v', 'a') },
{ CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') },