diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 14:57:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 14:57:57 +0100 |
| commit | 353dbaa29714c9fb7d4b3ccc7e1b50569b0ea257 (patch) | |
| tree | e0e67a898b5e6ce2ba9d641473960beb109995ff /libavformat/nut.c | |
| parent | 8686b6c68bacfdd9ffa89736756192188973ad5d (diff) | |
| parent | 3f111804eb5c603a344706b84b7164cbf7b4e0df (diff) | |
Merge commit '3f111804eb5c603a344706b84b7164cbf7b4e0df'
* commit '3f111804eb5c603a344706b84b7164cbf7b4e0df':
libvpx: make vp8 and vp9 selectable
libvpx: support vp9
nut: support vp9 tag
mkv: support vp9 tag
rtpdec: Make variables that should wrap unsigned
Conflicts:
configure
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.c')
| -rw-r--r-- | libavformat/nut.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index 62a650dbed..2abe969308 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -40,6 +40,7 @@ const AVCodecTag ff_nut_data_tags[] = { }; const AVCodecTag ff_nut_video_tags[] = { + { AV_CODEC_ID_VP9, MKTAG('V', 'P', '9', '0') }, { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) }, { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) }, { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 16 ) }, |