Commit dce93218 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Auto-detect hevc in mpeg-ts.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 19b41f86 16097efb
...@@ -301,6 +301,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, ...@@ -301,6 +301,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st,
{ "dts", AV_CODEC_ID_DTS, AVMEDIA_TYPE_AUDIO }, { "dts", AV_CODEC_ID_DTS, AVMEDIA_TYPE_AUDIO },
{ "eac3", AV_CODEC_ID_EAC3, AVMEDIA_TYPE_AUDIO }, { "eac3", AV_CODEC_ID_EAC3, AVMEDIA_TYPE_AUDIO },
{ "h264", AV_CODEC_ID_H264, AVMEDIA_TYPE_VIDEO }, { "h264", AV_CODEC_ID_H264, AVMEDIA_TYPE_VIDEO },
{ "hevc" , AV_CODEC_ID_HEVC , AVMEDIA_TYPE_VIDEO },
{ "loas", AV_CODEC_ID_AAC_LATM, AVMEDIA_TYPE_AUDIO }, { "loas", AV_CODEC_ID_AAC_LATM, AVMEDIA_TYPE_AUDIO },
{ "m4v", AV_CODEC_ID_MPEG4, AVMEDIA_TYPE_VIDEO }, { "m4v", AV_CODEC_ID_MPEG4, AVMEDIA_TYPE_VIDEO },
{ "mp3", AV_CODEC_ID_MP3, AVMEDIA_TYPE_AUDIO }, { "mp3", AV_CODEC_ID_MP3, AVMEDIA_TYPE_AUDIO },
......
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