diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2006-12-17 22:00:12 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2006-12-17 22:00:12 +0000 |
| commit | 9110a0e32d5eb421558145459e2a1fcc9720c170 (patch) | |
| tree | 7dbd7d7b28ecd7de0e6e981b84afc82dba377930 /libavformat | |
| parent | 95cefcb4ed4c0af96dea5fb993ee8349d1391021 (diff) | |
| download | ffmpeg-9110a0e32d5eb421558145459e2a1fcc9720c170.tar.gz | |
Add support for VP60 and VP61.
Originally committed as revision 7329 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/nsvdec.c | 6 | ||||
| -rw-r--r-- | libavformat/riff.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index 9a5fe97f89..e3c439a774 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -189,13 +189,13 @@ static const CodecTag nsv_codec_video_tags[] = { { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, { CODEC_ID_VP5, MKTAG('V', 'P', '5', ' ') }, { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, + { CODEC_ID_VP6, MKTAG('V', 'P', '6', ' ') }, + { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, + { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, /* { CODEC_ID_VP4, MKTAG('V', 'P', '4', ' ') }, { CODEC_ID_VP4, MKTAG('V', 'P', '4', '0') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', ' ') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, - { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, */ { CODEC_ID_XVID, MKTAG('X', 'V', 'I', 'D') }, /* cf sample xvid decoder from nsv_codec_sdk.zip */ { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', '3') }, diff --git a/libavformat/riff.c b/libavformat/riff.c index d315c66afb..81605cceb3 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -118,6 +118,8 @@ const CodecTag codec_bmp_tags[] = { { CODEC_ID_VP3, MKTAG('V', 'P', '3', '1') }, { CODEC_ID_VP3, MKTAG('V', 'P', '3', '0') }, { CODEC_ID_VP5, MKTAG('V', 'P', '5', '0') }, + { CODEC_ID_VP6, MKTAG('V', 'P', '6', '0') }, + { CODEC_ID_VP6, MKTAG('V', 'P', '6', '1') }, { CODEC_ID_VP6, MKTAG('V', 'P', '6', '2') }, { CODEC_ID_ASV1, MKTAG('A', 'S', 'V', '1') }, { CODEC_ID_ASV2, MKTAG('A', 'S', 'V', '2') }, |