[FFmpeg-cvslog] ffmpeg: Fix segfault with zzufed 4xm file.

Oana Stratulat git at videolan.org
Sat Jan 7 02:58:09 CET 2012


ffmpeg | branch: master | Oana Stratulat <oanaandreeastratulat at gmail.com> | Sat Jan  7 02:45:48 2012 +0100| [44cc1936be0ec2d734e5e2b4e215ce2908caf46e] | committer: Michael Niedermayer

ffmpeg: Fix segfault with zzufed 4xm file.
Fixes ticket 885

Signed-off-by: Oana Stratulat <oanaandreeastratulat at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44cc1936be0ec2d734e5e2b4e215ce2908caf46e
---

 ffmpeg.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ffmpeg.c b/ffmpeg.c
index 5bef906..15ce089 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);



More information about the ffmpeg-cvslog mailing list