[FFmpeg-cvslog] r15636 - trunk/ffmpeg.c

[stefano]

Author: stefano
Date: Sat Oct 18 20:27:32 2008
New Revision: 15636

Log:
Make ffmpeg abort if a preset file contains an invalid option or
argument.


Modified:
   trunk/ffmpeg.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Sat Oct 18 20:27:32 2008
@@ -3710,8 +3710,10 @@ static int opt_preset(const char *opt, c
             opt_video_codec(tmp2);
         }else if(!strcmp(tmp, "scodec")){
             opt_subtitle_codec(tmp2);
-        }else
-            opt_default(tmp, tmp2);
+        }else if(opt_default(tmp, tmp2) < 0){
+            fprintf(stderr, "Invalid option or argument: %s=%s\n", tmp, tmp2);
+            av_exit(1);
+        }
     }
 
     fclose(f);