diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 22:46:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-06 23:14:23 +0200 |
| commit | 787be6d0749603a73f268af8a3262428ff02d31e (patch) | |
| tree | 52f84575a8864b0b8505e8af9fd7752071152abd /libavcodec/codec_desc.c | |
| parent | 881f4e8d344044956d8ed3ee370e5c1bd882e1a1 (diff) | |
| parent | 6f273093e54cba130f3ffde3d6433e74baa4ad89 (diff) | |
| download | ffmpeg-787be6d0749603a73f268af8a3262428ff02d31e.tar.gz | |
Merge commit '6f273093e54cba130f3ffde3d6433e74baa4ad89'
* commit '6f273093e54cba130f3ffde3d6433e74baa4ad89':
LucasArts SMUSH VIMA audio decoder
Conflicts:
Changelog
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
libavcodec/vima.c
This commit adds a AV_CODEC_ID_ADPCM_VIMA alias in addition to the previously
used AV_CODEC_ID_VIMA, as well as a AVCodec with name "adpcm_vima" in addition
to the previously used name "vima"
These changes are needed for compatibility with the renamed codec in libav
See: b18357326ca1522d7fb7f4276ddebfccc29ce72c 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 1401c459eb..7ce4be0421 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1893,6 +1893,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("G.726 ADPCM little-endian"), .props = AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ADPCM_VIMA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_vima", + .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"), + .props = AV_CODEC_PROP_LOSSY, + }, /* AMR */ { @@ -2387,13 +2394,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY, }, { - .id = AV_CODEC_ID_VIMA, - .type = AVMEDIA_TYPE_AUDIO, - .name = "vima", - .long_name = NULL_IF_CONFIG_SMALL("LucasArts VIMA audio"), - .props = AV_CODEC_PROP_LOSSY, - }, - { .id = AV_CODEC_ID_FFWAVESYNTH, .type = AVMEDIA_TYPE_AUDIO, .name = "wavesynth", |