diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 22:50:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-31 22:50:40 +0100 |
| commit | dce93218d7bb2ce5c57a99f87be636bbce9e7638 (patch) | |
| tree | 1542e6fa31bbdb1041a1d1ef2c2249d35c1a1ebb | |
| parent | 19b41f86457d945e98c236f67faf59d560861a4c (diff) | |
| parent | 16097efb8caa808d8e9130415e55e3be35eb1c3c (diff) | |
| download | ffmpeg-dce93218d7bb2ce5c57a99f87be636bbce9e7638.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Auto-detect hevc in mpeg-ts.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 30e1463368..932b6ad9f8 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -301,6 +301,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, { "dts", AV_CODEC_ID_DTS, AVMEDIA_TYPE_AUDIO }, { "eac3", AV_CODEC_ID_EAC3, AVMEDIA_TYPE_AUDIO }, { "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 }, { "m4v", AV_CODEC_ID_MPEG4, AVMEDIA_TYPE_VIDEO }, { "mp3", AV_CODEC_ID_MP3, AVMEDIA_TYPE_AUDIO }, |