Commit 91c0fd94 authored by David Conrad's avatar David Conrad Committed by Fiona Glaser
Browse files

Fix lavf input with pipes and image sequences

x264 should now be able to encode from an image sequence using an image2-style formatted string (e.g. file%02d.jpg).
parent 535f0fa5
......@@ -719,13 +719,11 @@ static int select_input( const char *demuxer, char *used_demuxer, char *filename
if( b_regular )
{
FILE *f = fopen( filename, "r" );
if( !f )
if( f )
{
fprintf( stderr, "x264 [error]: could not open input file `%s'\n", filename );
return -1;
b_regular = x264_is_regular_file( f );
fclose( f );
}
b_regular = x264_is_regular_file( f );
fclose( f );
}
const char *module = b_auto ? ext : demuxer;
......@@ -756,7 +754,7 @@ static int select_input( const char *demuxer, char *used_demuxer, char *filename
#endif
#ifdef LAVF_INPUT
if( (b_auto || !strcasecmp( demuxer, "lavf" )) &&
(!b_regular || !lavf_input.open_file( filename, p_handle, info, opt )) )
!lavf_input.open_file( filename, p_handle, info, opt ) )
{
module = "lavf";
b_auto = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment