summaryrefslogtreecommitdiffstats
path: root/libhb/scan.c
diff options
context:
space:
mode:
authordynaflash <[email protected]>2007-12-31 17:11:15 +0000
committerdynaflash <[email protected]>2007-12-31 17:11:15 +0000
commita2a317c82d8b98e2fbce23bd4bf1b0ce9bb65c14 (patch)
tree9d50f13f633497305c9cc5e6218c0e92f7444196 /libhb/scan.c
parent68cb0b2457e5a474040b52fab2f3ec873d1b2399 (diff)
Program Stream Enhancements - Van: Libhb
- Thanks Van ! - Identifies program streams by type instead of file extension - Improves proper duration reporting of program streams - fixes audio reconvergence code in libhb/sync.c trying to free a null buffer causing a crash - Assorted other enhancements to encoding program streams. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1155 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/scan.c')
-rw-r--r--libhb/scan.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/libhb/scan.c b/libhb/scan.c
index 272f03ffb..5da1640ed 100644
--- a/libhb/scan.c
+++ b/libhb/scan.c
@@ -70,19 +70,14 @@ static void ScanFunc( void * _data )
}
}
}
+ else if ( (data->stream = hb_stream_open (data->path)) != NULL )
+ {
+ hb_list_add( data->list_title, hb_stream_title_scan( data->stream ) );
+ }
else
{
- if ( hb_stream_is_stream_type(data->path) )
- {
- hb_log( "scan: trying to open as MPEG-2 Stream");
- data->stream = hb_stream_open (data->path);
- hb_list_add( data->list_title, hb_stream_title_scan( data->stream ) );
- }
- else
- {
- hb_log( "scan: unrecognized file type" );
- return;
- }
+ hb_log( "scan: unrecognized file type" );
+ return;
}
for( i = 0; i < hb_list_count( data->list_title ); )