[x264-devel] commit: Allow --demuxer forcing with known extensions (Anton Mitrofanov )

[git at videolan.org]

x264 | branch: master | Anton Mitrofanov <BugMaster at narod.ru> | Tue Aug 31 08:45:22 2010 -0700| [44ff90e6fc4a895cf6ed65ca39da5b3083daa3dd] | committer: Jason Garrett-Glaser 

Allow --demuxer forcing with known extensions

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=44ff90e6fc4a895cf6ed65ca39da5b3083daa3dd
---

 x264.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x264.c b/x264.c
index c1f98c0..9b09fac 100644
--- a/x264.c
+++ b/x264.c
@@ -933,9 +933,9 @@ static int select_output( const char *muxer, char *filename, x264_param_t *param
 static int select_input( const char *demuxer, char *used_demuxer, char *filename,
                          hnd_t *p_handle, video_info_t *info, cli_input_opt_t *opt )
 {
-    const char *ext = get_filename_extension( filename );
-    int b_regular = strcmp( filename, "-" );
     int b_auto = !strcasecmp( demuxer, "auto" );
+    const char *ext = b_auto ? get_filename_extension( filename ) : "";
+    int b_regular = strcmp( filename, "-" );
     if( !b_regular && b_auto )
         ext = "raw";
     b_regular = b_regular && x264_is_regular_file_path( filename );