Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/LAVFilters.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2012-10-27 18:46:31 +0400
committerHendrik Leppkes <h.leppkes@gmail.com>2012-10-27 18:46:49 +0400
commit8902ef5243a474b0cf7b6613c2e9b1b373385a93 (patch)
tree860374067f3c2e1595a35e1d15ce6c172f46db44
parentececaf2f0c27aeb3e6e49bb1a4923f88c1a5fa38 (diff)
Add proper media type for MPEG-4 ASP in MPEG-TS
Fixes issue 283.
-rw-r--r--demuxer/Demuxers/LAVFVideoHelper.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/demuxer/Demuxers/LAVFVideoHelper.cpp b/demuxer/Demuxers/LAVFVideoHelper.cpp
index 2df1a879..9f92a169 100644
--- a/demuxer/Demuxers/LAVFVideoHelper.cpp
+++ b/demuxer/Demuxers/LAVFVideoHelper.cpp
@@ -88,6 +88,9 @@ CMediaType CLAVFVideoHelper::initVideoType(AVCodecID codecId, unsigned int &code
case AV_CODEC_ID_MPEG4:
if (container == "mp4") {
mediaType.formattype = FORMAT_MPEG2Video;
+ } else if (container == "mpegts") {
+ mediaType.formattype = FORMAT_VideoInfo2;
+ mediaType.subtype = MEDIASUBTYPE_MP4V;
} else {
mediaType.formattype = FORMAT_VideoInfo2;
}