Commit 3d2b660a authored by bcoudurier's avatar bcoudurier

fix decoding of big audio packets (48k 16bit 2 channels), needed size is...

fix decoding of big audio packets (48k 16bit 2 channels), needed size is related to samples which is short * while len passed to decode_audio2 is related to pkt->data which is uint8_t *

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8537 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 7dfac145
...@@ -1049,7 +1049,7 @@ static int output_packet(AVInputStream *ist, int ist_index, ...@@ -1049,7 +1049,7 @@ static int output_packet(AVInputStream *ist, int ist_index,
switch(ist->st->codec->codec_type) { switch(ist->st->codec->codec_type) {
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*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE));
data_size= samples_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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment