summaryrefslogtreecommitdiff
authorBang Peng <bang.peng@amlogic.com>2017-04-10 01:38:34 (GMT)
committer Zhi Zhou <zhi.zhou@amlogic.com>2017-04-12 12:45:18 (GMT)
commit77d2269a45227e6d6e7ed71150eb6df086e2660a (patch)
tree3550f7f8d304a6aa4e0eced775d40935e5cf1d91
parentc293646916c0993844c026a16f9e99a9fa24888d (diff)
downloadffmpeg-77d2269a45227e6d6e7ed71150eb6df086e2660a.zip
ffmpeg-77d2269a45227e6d6e7ed71150eb6df086e2660a.tar.gz
ffmpeg-77d2269a45227e6d6e7ed71150eb6df086e2660a.tar.bz2
PD#141973:fixed not demux dtse
Change-Id: I6ec0a199b78e2f17e4c8c84971624f72eb3b9c3a
Diffstat
-rw-r--r--libavformat/isom.c2
-rw-r--r--libavformat/mpegts.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index 112fbb3..047ac8d 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -264,6 +264,8 @@ const AVCodecTag ff_codec_movaudio_tags[] = {
{ AV_CODEC_ID_DTS, MKTAG('d', 't', 's', 'h') }, /* DTS-HD audio formats */
{ AV_CODEC_ID_DTS, MKTAG('d', 't', 's', 'l') }, /* DTS-HD Lossless formats */
{ AV_CODEC_ID_DTS, MKTAG('D', 'T', 'S', ' ') }, /* non-standard */
+ { AV_CODEC_ID_DTS, MKTAG('d', 't', 's', 'e') },
+ { AV_CODEC_ID_DTS, MKTAG('d', 't', 's', '+') },
{ AV_CODEC_ID_EAC3, MKTAG('e', 'c', '-', '3') }, /* ETSI TS 102 366 Annex F (only valid in ISOBMFF) */
{ AV_CODEC_ID_DVAUDIO, MKTAG('v', 'd', 'v', 'a') },
{ AV_CODEC_ID_DVAUDIO, MKTAG('d', 'v', 'c', 'a') },
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index c148d59..84d217c 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -640,6 +640,7 @@ static const StreamType REGD_types[] = {
{ MKTAG('K','L','V','A'), AVMEDIA_TYPE_DATA, AV_CODEC_ID_SMPTE_KLV },
{ MKTAG('V','C','-','1'), AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 },
{ MKTAG('D','R','A','1'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DRA },
+ { MKTAG('D','T','S','H'), AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_DTS },
{ 0 },
};