RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/mpegtsenc: fix HEVC MPEG TS stream type 

Allowing HEVC video using TS stream type 0x24

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
olugbone 2014-03-03 19:32:41 +00:00 committed by Michael Niedermayer
parent efc4439c89
commit b2880a3de9
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/mpegts.h
View File

@ -52,6 +52,7 @@
#define STREAM_TYPE_AUDIO_AAC_LATM 0x11 #define STREAM_TYPE_AUDIO_AAC_LATM 0x11
#define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_MPEG4 0x10
#define STREAM_TYPE_VIDEO_H264 0x1b #define STREAM_TYPE_VIDEO_H264 0x1b
#define STREAM_TYPE_VIDEO_HEVC 0x24 //Definition of 0x24 HEVC video MPEG TS stream type
#define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_VIDEO_CAVS 0x42
#define STREAM_TYPE_VIDEO_VC1 0xea #define STREAM_TYPE_VIDEO_VC1 0xea
#define STREAM_TYPE_VIDEO_DIRAC 0xd1 #define STREAM_TYPE_VIDEO_DIRAC 0xd1

3
libavformat/mpegtsenc.c
View File

@ -292,6 +292,9 @@ static int mpegts_write_pmt(AVFormatContext *s, MpegTSService *service)
case AV_CODEC_ID_H264: case AV_CODEC_ID_H264:
stream_type = STREAM_TYPE_VIDEO_H264; stream_type = STREAM_TYPE_VIDEO_H264;
break; break;
case AV_CODEC_ID_HEVC:
stream_type = STREAM_TYPE_VIDEO_HEVC;
break;
case AV_CODEC_ID_CAVS: case AV_CODEC_ID_CAVS:
stream_type = STREAM_TYPE_VIDEO_CAVS; stream_type = STREAM_TYPE_VIDEO_CAVS;
break; break;