1
0
Fork 0

Merging upstream version 1.1~rc2.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:43:06 +01:00
parent 24e2ea3a41
commit e13f4df619
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
26 changed files with 1151 additions and 583 deletions

View file

@ -66,13 +66,13 @@ int open_other_instream( std::string & name )
}
void get_format_types( const std::string & arg, int format_types[2] )
void parse_format_types( const std::string & arg, int format_types[2] )
{
const unsigned i = std::min( arg.find( ',' ), arg.size() );
if( i > 0 ) format_types[0] = get_format_type( arg.substr( 0, i ) );
if( i > 0 ) format_types[0] = parse_format_type( arg.substr( 0, i ) );
else format_types[0] = -1;
if( i + 1 < arg.size() ) format_types[1] =
get_format_type( arg.substr( i + 1 ) );
parse_format_type( arg.substr( i + 1 ) );
else format_types[1] = -1;
}