Skip to content
Snippets Groups Projects
Commit 5d55e966 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

use avcodec_decode_audio2()

Originally committed as revision 7792 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 30e88789
No related branches found
No related tags found
No related merge requests found
...@@ -1066,9 +1066,10 @@ static int output_packet(AVInputStream *ist, int ist_index, ...@@ -1066,9 +1066,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
case CODEC_TYPE_AUDIO:{ case CODEC_TYPE_AUDIO:{
if(pkt) if(pkt)
samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE)); samples= av_fast_realloc(samples, &samples_size, FFMAX(pkt->size, AVCODEC_MAX_AUDIO_FRAME_SIZE));
data_size= samples_size;
/* XXX: could avoid copy if PCM 16 bits with same /* XXX: could avoid copy if PCM 16 bits with same
endianness as CPU */ endianness as CPU */
ret = avcodec_decode_audio(ist->st->codec, samples, &data_size, ret = avcodec_decode_audio2(ist->st->codec, samples, &data_size,
ptr, len); ptr, len);
if (ret < 0) if (ret < 0)
goto fail_decode; goto fail_decode;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment