X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg.c;h=b2e39e8d0eed3604c676cddbe57f65ae8aa8955b;hb=32388e04a80139740e495639e3237e99de3b5662;hp=9edc721688febff5cb2ff49bfbef0f0a47791766;hpb=d3f3035f0857d04b1f7c5b1d44c7f3f0972638a0;p=ffmpeg

diff --git a/ffmpeg.c b/ffmpeg.c
index 9edc721688f..b2e39e8d0ee 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -517,6 +517,8 @@ static void ffmpeg_cleanup(int ret)
     if (received_sigterm) {
         av_log(NULL, AV_LOG_INFO, "Received signal %d: terminating.\n",
                (int) received_sigterm);
+    } else if (ret && transcode_init_done) {
+        av_log(NULL, AV_LOG_INFO, "Conversion failed!\n");
     }
     term_exit();
 }
@@ -2148,7 +2150,7 @@ static void print_sdp(void)
 {
     char sdp[16384];
     int i;
-    AVFormatContext **avc = av_malloc(sizeof(*avc) * nb_output_files);
+    AVFormatContext **avc = av_malloc_array(nb_output_files, sizeof(*avc));
 
     if (!avc)
         exit_program(1);
@@ -2283,7 +2285,7 @@ static void parse_forced_key_frames(char *kf, OutputStream *ost,
         if (*p == ',')
             n++;
     size = n;
-    pts = av_malloc(sizeof(*pts) * size);
+    pts = av_malloc_array(size, sizeof(*pts));
     if (!pts) {
         av_log(NULL, AV_LOG_FATAL, "Could not allocate forced key frames array.\n");
         exit_program(1);