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 /libavformat | |
| parent | 7b7b418277fc36a864f7b8b449feacb39f2dbced (diff) | |
| download | ffmpeg-dfb0b9370d3621ab1f603e7bb8e142b1f6996562.tar.gz | |
avcodec: fix pcm zork decoder
Fixes #1939
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/riff.c | 2 | ||||
| -rw-r--r-- | libavformat/riffdec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index c73f6e9db0..b15d5e9753 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -516,7 +516,7 @@ const AVCodecTag ff_codec_wav_tags[] = { { AV_CODEC_ID_ADPCM_IMA_OKI, 0x0010 }, { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0011 }, /* must come after adpcm_ima_wav in this list */ - { AV_CODEC_ID_PCM_ZORK, 0x0011 }, + { AV_CODEC_ID_ADPCM_ZORK, 0x0011 }, { AV_CODEC_ID_ADPCM_IMA_OKI, 0x0017 }, { AV_CODEC_ID_ADPCM_YAMAHA, 0x0020 }, { AV_CODEC_ID_TRUESPEECH, 0x0022 }, diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index 070c42eee3..533bb5a15d 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -202,7 +202,7 @@ enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps) id = ff_get_pcm_codec_id(bps, 1, 0, 0); if (id == AV_CODEC_ID_ADPCM_IMA_WAV && bps == 8) - id = AV_CODEC_ID_PCM_ZORK; + id = AV_CODEC_ID_ADPCM_ZORK; return id; } |