summaryrefslogtreecommitdiff
path: root/libavformat/apc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-24 22:53:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-24 22:53:59 +0100
commit1d9569f9e8361c3be06b9732c0b80639a51b4b87 (patch)
tree95f5730b649726856ee2babd9c2bb30f9601f4b6 /libavformat/apc.c
parent76c3e76eb35ce7cca5c912f0d21b736bb0be22fb (diff)
parentefe68076dab56293168ffb66d7b6c1977b740098 (diff)
downloadffmpeg-1d9569f9e8361c3be06b9732c0b80639a51b4b87.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits) aacenc: Fix identification padding when the bitstream is already aligned. aacenc: Write correct length for long identification strings. aud: remove unneeded field, audio_stream_index from context aud: fix time stamp calculation for ADPCM IMA WS aud: simplify header parsing aud: set pts_wrap_bits to 64. cosmetics: indentation aud: support Westwood SND1 audio in AUD files. adpcm_ima_ws: fix stereo decoding avcodec: add a new codec_id for CRYO APC IMA ADPCM. vqa: remove unused context fields, audio_samplerate and audio_bits vqa: clean up audio header parsing vqa: set time base to frame rate as coded in the header. vqa: set packet duration. vqa: use 1/sample_rate as the audio stream time base vqa: set stream start_time to 0. lavc: postpone the removal of AVCodecContext.request_channels. lavf: postpone removing av_close_input_file(). lavc: postpone removing old audio encoding and decoding API avplay: remove the -er option. ... Conflicts: Changelog libavcodec/version.h libavdevice/v4l.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/apc.c')
-rw-r--r--libavformat/apc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/apc.c b/libavformat/apc.c
index 5d7bb6f31c..1e942e69c9 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);