diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-01-23 14:57:32 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2012-01-24 14:13:41 -0500 |
| commit | 220506d23f39da3e23d3d42fb7061f19cec8052c (patch) | |
| tree | 5a1621e906a2c3ce4c4b9a2b9c5e36800c142d9e /libavformat | |
| parent | 4340a6363e9ff75dc4e8ce14dc96671623494ed8 (diff) | |
| download | ffmpeg-220506d23f39da3e23d3d42fb7061f19cec8052c.tar.gz | |
avcodec: add a new codec_id for CRYO APC IMA ADPCM.
The stereo layout and extradata is significantly different from that in
Westwood IMA ADPCM, so a separate codec_id is warranted.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/apc.c | 2 | ||||
| -rw-r--r-- | libavformat/yop.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/apc.c b/libavformat/apc.c index 238395087c..47ab5c821b 100644 --- a/libavformat/apc.c +++ b/libavformat/apc.c @@ -44,7 +44,7 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap) return AVERROR(ENOMEM); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; - st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS; + st->codec->codec_id = CODEC_ID_ADPCM_IMA_APC; avio_rl32(pb); /* number of samples */ st->codec->sample_rate = avio_rl32(pb); diff --git a/libavformat/yop.c b/libavformat/yop.c index a317825a7c..e5ace8b805 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -72,7 +72,7 @@ static int yop_read_header(AVFormatContext *s, AVFormatParameters *ap) // Audio audio_dec = audio_stream->codec; audio_dec->codec_type = AVMEDIA_TYPE_AUDIO; - audio_dec->codec_id = CODEC_ID_ADPCM_IMA_WS; + audio_dec->codec_id = CODEC_ID_ADPCM_IMA_APC; audio_dec->channels = 1; audio_dec->sample_rate = 22050; |