summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2007-02-01 00:34:09 +0000
committerMichael Niedermayer <michaelni@gmx.at>2007-02-01 00:34:09 +0000
commit5d55e966e18ec3490c20db85a3a137ba81cb2ad3 (patch)
treef48a47a7199b462a94da9153c30910fe7815c6b9 /ffmpeg.c
parent30e88789c958b7a28866d241cc99fa9c3abf9115 (diff)
use avcodec_decode_audio2()
Originally committed as revision 7792 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index be93da9e46..5cb702a9a6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1066,9 +1066,10 @@ static int output_packet(AVInputStream *ist, int ist_index,
case CODEC_TYPE_AUDIO:{
if(pkt)
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
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);
if (ret < 0)
goto fail_decode;