diff options
| author | Tom Finegan <tomfinegan@chromium.org> | 2012-12-15 23:18:41 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-01-14 19:20:47 +0100 |
| commit | 66aabd76a9c0eaa65baad72453ca09eb161fee25 (patch) | |
| tree | 5b9d97240f39e8e9e297f1504cc75e8aa55069cd | |
| parent | d596f2b32264e79029ead5cc3f9d4dee22c2f49e (diff) | |
| download | ffmpeg-66aabd76a9c0eaa65baad72453ca09eb161fee25.tar.gz | |
mkv: support vp9 tag
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavformat/matroska.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e57170b509..09b9b42ec7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -267,6 +267,7 @@ enum AVCodecID { AV_CODEC_ID_MTS2, AV_CODEC_ID_CLLC, AV_CODEC_ID_MSS2, + AV_CODEC_ID_VP9, /* various PCM "codecs" */ AV_CODEC_ID_FIRST_AUDIO = 0x10000, ///< A dummy id pointing at the start of audio codecs diff --git a/libavformat/matroska.c b/libavformat/matroska.c index 5d1c13406a..7976be04a3 100644 --- a/libavformat/matroska.c +++ b/libavformat/matroska.c @@ -79,6 +79,7 @@ const CodecTags ff_mkv_codec_tags[]={ {"V_THEORA" , AV_CODEC_ID_THEORA}, {"V_UNCOMPRESSED" , AV_CODEC_ID_RAWVIDEO}, {"V_VP8" , AV_CODEC_ID_VP8}, + {"V_VP9" , AV_CODEC_ID_VP9}, {"" , AV_CODEC_ID_NONE} }; |