diff options
| author | Dirk Farin <dirk.farin@gmail.com> | 2013-09-02 14:33:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-03 19:34:04 +0200 |
| commit | 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 (patch) | |
| tree | 0dc192452ab17e725c16fb40cad7107dccc91ded /libavcodec | |
| parent | 771e2e59e2afeba6f195645678645b8c874e59a2 (diff) | |
avformat: H265 demuxer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 070ce7a12d..e1bb79f1b9 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -300,6 +300,7 @@ enum AVCodecID { AV_CODEC_ID_SNOW = MKBETAG('S','N','O','W'), AV_CODEC_ID_WEBP = MKBETAG('W','E','B','P'), AV_CODEC_ID_SMVJPEG = MKBETAG('S','M','V','J'), + AV_CODEC_ID_H265 = MKBETAG('H','2','6','5'), /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 523b61761f..1e4cf2e23e 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -226,6 +226,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_H265, + .type = AVMEDIA_TYPE_VIDEO, + .name = "h265", + .long_name = NULL_IF_CONFIG_SMALL("H.265 / HEVC"), + .props = AV_CODEC_PROP_LOSSY | AV_CODEC_PROP_LOSSLESS, + }, + { .id = AV_CODEC_ID_INDEO3, .type = AVMEDIA_TYPE_VIDEO, .name = "indeo3", |