diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 12:42:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 12:47:26 +0200 |
| commit | e5cdf9c03b1ef0913dad117b0e5d343a525f6d10 (patch) | |
| tree | 82a2beb4104fa6f9c5d8d6a862b4165be227072c /libavformat/riff.c | |
| parent | 5c43f3ddea40fc76264d647750f6986a9247aead (diff) | |
| parent | 2d66a58ccde05e764594bd7e5f0f9244634d0b2c (diff) | |
Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c'
* commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c':
Go2Webinar decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavformat/riff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index 7ad96a8a76..09a7863ffd 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -325,9 +325,6 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_DPX, MKTAG('d', 'p', 'x', ' ') }, { AV_CODEC_ID_KGV1, MKTAG('K', 'G', 'V', '1') }, { AV_CODEC_ID_LAGARITH, MKTAG('L', 'A', 'G', 'S') }, - { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '2') }, - { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '3') }, - { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') }, { AV_CODEC_ID_AMV, MKTAG('A', 'M', 'V', 'F') }, { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'A') }, { AV_CODEC_ID_UTVIDEO, MKTAG('U', 'L', 'R', 'G') }, @@ -349,6 +346,9 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, { AV_CODEC_ID_012V, MKTAG('0', '1', '2', 'v') }, { AV_CODEC_ID_012V, MKTAG('a', '1', '2', 'v') }, + { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '2') }, + { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '3') }, + { AV_CODEC_ID_G2M, MKTAG('G', '2', 'M', '4') }, { AV_CODEC_ID_NONE, 0 } }; |