AviSynth: throw error if wrong format is used

HomeOfAviSynthPlusEvolution · Dec 14, 2023 · d365e8b · d365e8b
1 parent 5d61a8f
commit d365e8b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/AviSynth/libavsmash_source.cpp b/AviSynth/libavsmash_source.cpp
@@ -527,7 +527,13 @@ AVSValue __cdecl CreateLSMASHVideoSource( AVSValue args, void *user_data, IScrip
     int         direct_rendering        = args[5].AsBool( false ) ? 1 : 0;
     int         fps_num                 = args[6].AsInt( 0 );
     int         fps_den                 = args[7].AsInt( 1 );
-    enum AVPixelFormat pixel_format     = get_av_output_pixel_format( args[8].AsString( nullptr ) );
+    enum AVPixelFormat pixel_format = AV_PIX_FMT_NONE;
+    if (args[8].Defined())
+    {
+        pixel_format = get_av_output_pixel_format(args[8].AsString(nullptr));
+        if (pixel_format == AV_PIX_FMT_NONE)
+            env->ThrowError("LSMASHVideoSource: wrong format.");
+    }
     const char *preferred_decoder_names = args[9].AsString( nullptr );
     int         prefer_hw_decoder       = args[10].AsInt( 0 );
     int         ff_loglevel             = args[11].AsInt( 0 );

diff --git a/AviSynth/lwlibav_source.cpp b/AviSynth/lwlibav_source.cpp
@@ -412,7 +412,13 @@ AVSValue __cdecl CreateLWLibavVideoSource( AVSValue args, void *user_data, IScri
             return 2;
     }();
     int         field_dominance         = args[11].AsInt( 0 );
-    enum AVPixelFormat pixel_format     = get_av_output_pixel_format( args[12].AsString( nullptr ) );
+    enum AVPixelFormat pixel_format = AV_PIX_FMT_NONE;
+    if (args[12].Defined())
+    {
+        pixel_format = get_av_output_pixel_format(args[12].AsString());
+        if (pixel_format == AV_PIX_FMT_NONE)
+            env->ThrowError("LWLibavVideoSource: wrong format.");
+    }
     const char *preferred_decoder_names = args[13].AsString( nullptr );
     int         prefer_hw_decoder       = args[14].AsInt( 0 );
     int         ff_loglevel             = args[15].AsInt( 0 );