diff options
| author | Paul B Mahol <onemda@gmail.com> | 2020-02-14 20:37:42 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2020-02-16 12:54:57 +0100 |
| commit | dfb0b9370d3621ab1f603e7bb8e142b1f6996562 (patch) | |
| tree | c67df7eb8327419f95d485647b353318b666f4f3 /libavcodec/codec_desc.c | |
| parent | 7b7b418277fc36a864f7b8b449feacb39f2dbced (diff) | |
| download | ffmpeg-dfb0b9370d3621ab1f603e7bb8e142b1f6996562.tar.gz | |
avcodec: fix pcm zork decoder
Fixes #1939
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 960c4889f8..609c7501fd 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1876,13 +1876,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSLESS, }, { - .id = AV_CODEC_ID_PCM_ZORK, - .type = AVMEDIA_TYPE_AUDIO, - .name = "pcm_zork", - .long_name = NULL_IF_CONFIG_SMALL("PCM Zork"), - .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, - }, - { .id = AV_CODEC_ID_PCM_S16LE_PLANAR, .type = AVMEDIA_TYPE_AUDIO, .name = "pcm_s16le_planar", @@ -2318,6 +2311,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Simon & Schuster Interactive"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ADPCM_ZORK, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_zork", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM Zork"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* AMR */ { |