aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOana Stratulat <oanaandreeastratulat@gmail.com>2012-01-07 02:45:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-07 02:46:30 +0100
commit44cc1936be0ec2d734e5e2b4e215ce2908caf46e (patch)
tree0eb7cc54d096af126d6e12bb4f5cef94dbc9550a
parent6a56f4e63423d616b2224f654c1794fac25d6cfb (diff)
downloadffmpeg-44cc1936be0ec2d734e5e2b4e215ce2908caf46e.tar.gz
ffmpeg: Fix segfault with zzufed 4xm file.
Fixes ticket 885 Signed-off-by: Oana Stratulat <oanaandreeastratulat@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 5bef906c36..15ce0894ac 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1020,9 +1020,9 @@ static void do_audio_out(AVFormatContext *s, OutputStream *ost,
InputStream *ist, AVFrame *decoded_frame)
{
uint8_t *buftmp;
- int64_t audio_out_size, audio_buf_size;
+ int64_t audio_out_size, audio_buf_size, size_out;
- int size_out, frame_bytes, ret, resample_changed;
+ int frame_bytes, ret, resample_changed;
AVCodecContext *enc = ost->st->codec;
AVCodecContext *dec = ist->st->codec;
int osize = av_get_bytes_per_sample(enc->sample_fmt);