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 /libavcodec/codec_desc.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 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 034d7359d5..f195f89fd3 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1291,12 +1291,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY, }, { - .id = AV_CODEC_ID_G2M, - .type = AVMEDIA_TYPE_VIDEO, - .name = "g2m", - .long_name = NULL_IF_CONFIG_SMALL("GoToMeeting"), - }, - { .id = AV_CODEC_ID_AVUI, .type = AVMEDIA_TYPE_VIDEO, .name = "avui", @@ -1385,6 +1379,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Sigmatel Motion Video"), }, + { + .id = AV_CODEC_ID_G2M, + .type = AVMEDIA_TYPE_VIDEO, + .name = "g2m", + .long_name = NULL_IF_CONFIG_SMALL("Go2Meeting"), + .props = AV_CODEC_PROP_LOSSY, + }, /* various PCM "codecs" */ { |