Skip to content

F
ffmpeg
Commit b6a47016 authored by Mickaël Raulet's avatar Mickaël Raulet Committed by Anton Khirnov
Browse files
Options

mpegts: Support HEVC demuxing 

Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
parent 959bea13
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
Changelog
View file @ b6a47016
...@@ -42,7 +42,7 @@ version 10: ...@@ -42,7 +42,7 @@ version 10:
- F4V muxer - F4V muxer
- HNM version 4 demuxer and video decoder - HNM version 4 demuxer and video decoder
- HEVC decoder - HEVC decoder
- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing - raw HEVC, HEVC in MOV/MP4, HEVC in Matroska, HEVC in MPEG-TS demuxing
version 9: version 9:
......
libavformat/mpegts.c
View file @ b6a47016
...@@ -537,6 +537,7 @@ static const StreamType ISO_types[] = { ...@@ -537,6 +537,7 @@ static const StreamType ISO_types[] = {
{ 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 }, { 0x10, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 },
{ 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM }, /* LATM syntax */ { 0x11, AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC_LATM }, /* LATM syntax */
{ 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 }, { 0x1b, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 },
{ 0x24, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_HEVC },
{ 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS }, { 0x42, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_CAVS },
{ 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC }, { 0xd1, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_DIRAC },
{ 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 }, { 0xea, AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_VC1 },
......
libavformat/version.h
View file @ b6a47016
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 9 #define LIBAVFORMAT_VERSION_MINOR 9
#define LIBAVFORMAT_VERSION_MICRO 2 #define LIBAVFORMAT_VERSION_MICRO 3
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment