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

Merge remote-tracking branch 'cehoyos/master' 

* cehoyos/master:
  Auto-detect hevc in mpeg-ts.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-31 22:50:37 +01:00
parent 19b41f8645 16097efb8c
commit dce93218d7
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/utils.c
View File

@ -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 },