diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 22:00:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 22:19:16 +0200 |
| commit | 881f4e8d344044956d8ed3ee370e5c1bd882e1a1 (patch) | |
| tree | 36f3ead18d2f52929b0a72fc0d4a7af7af8fd0a3 /libavcodec/codec_desc.c | |
| parent | a0568ed2544025de3c66dd500811f5ba43f38af4 (diff) | |
| parent | a420ccd4f2a011887451a7d5e1bebba4fd7c40e2 (diff) | |
| download | ffmpeg-881f4e8d344044956d8ed3ee370e5c1bd882e1a1.tar.gz | |
Merge commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2'
* commit 'a420ccd4f2a011887451a7d5e1bebba4fd7c40e2':
LucasArts SMUSH SANM video decoder
Conflicts:
Changelog
doc/general.texi
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/sanm.c
libavcodec/version.h
See: 69254f46286099588514454f60fad12f6e51b2cd and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index f3a10ade3a..1401c459eb 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1159,13 +1159,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY, }, { - .id = AV_CODEC_ID_SANM, - .type = AVMEDIA_TYPE_VIDEO, - .name = "sanm", - .long_name = NULL_IF_CONFIG_SMALL("LucasArts SMUSH video"), - .props = AV_CODEC_PROP_LOSSY, - }, - { .id = AV_CODEC_ID_AVRN, .type = AVMEDIA_TYPE_VIDEO, .name = "avrn", @@ -1233,6 +1226,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("On2 VP7"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_SANM, + .type = AVMEDIA_TYPE_VIDEO, + .name = "sanm", + .long_name = NULL_IF_CONFIG_SMALL("LucasArts SANM/SMUSH video"), + .props = AV_CODEC_PROP_LOSSY, + }, /* image codecs */ { |