[SCM] libav/experimental: Make ffmpeg fail if the argument provided to the -pix_fmt option is invalid.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:41:45 UTC 2013


The following commit has been merged in the experimental branch:
commit 90da2b50865549e086d4491cbb2bdc54af38ea4f
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Thu Mar 19 22:29:32 2009 +0000

    Make ffmpeg fail if the argument provided to the -pix_fmt option is
    invalid.
    
    Originally committed as revision 18053 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 99335f8..14aa07e 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2536,9 +2536,13 @@ static void list_fmts(void (*get_fmt_string)(char *buf, int buf_size, int fmt),
 
 static void opt_frame_pix_fmt(const char *arg)
 {
-    if (strcmp(arg, "list"))
+    if (strcmp(arg, "list")) {
         frame_pix_fmt = avcodec_get_pix_fmt(arg);
-    else {
+        if (frame_pix_fmt == PIX_FMT_NONE) {
+            fprintf(stderr, "Unknown pixel format requested: %s\n", arg);
+            av_exit(1);
+        }
+    } else {
         list_fmts(avcodec_pix_fmt_string, PIX_FMT_NB);
         av_exit(0);
     }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list