Merge commit 'fcf597625c7a991ca389f3a9b8ff4f5e383301c0'

[ffmpeg] / ffplay.c

diff --git a/ffplay.c b/ffplay.c
index e66dea1fcded4efa9758c256691d1a85ed987072..06bccce45e5ab8daa36cb03eb55ffc62c7f08b8d 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -311,7 +311,7 @@ static int fast = 0;
 static int genpts = 0;
 static int lowres = 0;
 static int decoder_reorder_pts = -1;
-static int autoexit;
+static int autoexit = 1;
 static int exit_on_keydown;
 static int exit_on_mousedown;
 static int loop = 1;
@@ -991,7 +991,7 @@ static void video_audio_display(VideoState *s)
             av_free(s->rdft_data);
             s->rdft = av_rdft_init(rdft_bits, DFT_R2C);
             s->rdft_bits = rdft_bits;
-            s->rdft_data = av_malloc(4 * nb_freq * sizeof(*s->rdft_data));
+            s->rdft_data = av_malloc_array(nb_freq, 4 *sizeof(*s->rdft_data));
         }
         {
             FFTSample *data[2];