summaryrefslogtreecommitdiff
path: root/avconv.c
diff options
context:
space:
mode:
authorAlex Converse <alex.converse@gmail.com>2011-09-27 10:20:23 -0700
committerAlex Converse <alex.converse@gmail.com>2011-09-27 14:10:12 -0700
commitaf3c06b4dbe3bdc801d3fdc3392e7f47b414c17c (patch)
tree1e0ab4f22f993685029dae14c64aa8a068fa55c5 /avconv.c
parentd3c1d37a9019ed32a1710d53c1ad08c44bd072da (diff)
avconv: Use the size of the decode sample format when allocating the audio samples buffer.
Diffstat (limited to 'avconv.c')
-rw-r--r--avconv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/avconv.c b/avconv.c
index ed5d7092fe..ad5547f874 100644
--- a/avconv.c
+++ b/avconv.c
@@ -1573,8 +1573,8 @@ static int output_packet(InputStream *ist, int ist_index,
if (ist->decoding_needed) {
switch(ist->st->codec->codec_type) {
case AVMEDIA_TYPE_AUDIO:{
- if(pkt && samples_size < FFMAX(pkt->size*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE)) {
- samples_size = FFMAX(pkt->size*sizeof(*samples), AVCODEC_MAX_AUDIO_FRAME_SIZE);
+ if(pkt && samples_size < FFMAX(pkt->size * bps, AVCODEC_MAX_AUDIO_FRAME_SIZE)) {
+ samples_size = FFMAX(pkt->size * bps, AVCODEC_MAX_AUDIO_FRAME_SIZE);
av_free(samples);
samples= av_malloc(samples_size);
}