Author: qboosh Date: Sun Mar 11 17:20:16 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- merged from AC-branch
---- Files affected:
SOURCES:
DirectFB-extra-mpeg3_open.patch (1.1 -> 1.2) (NEW)
---- Diffs:
================================================================
Index: SOURCES/DirectFB-extra-mpeg3_open.patch
diff -u /dev/null SOURCES/DirectFB-extra-mpeg3_open.patch:1.2
--- /dev/null Sun Mar 11 18:20:16 2007
+++ SOURCES/DirectFB-extra-mpeg3_open.patch Sun Mar 11 18:20:11 2007
@@ -0,0 +1,41 @@
+diff -ur
DirectFB-extra-1.0.0.orig/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c
DirectFB-extra-1.0.0/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c
+---
DirectFB-extra-1.0.0.orig/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c
2006-11-23 00:42:47.000000000 +0100
++++
DirectFB-extra-1.0.0/interfaces/IDirectFBVideoProvider/idirectfbvideoprovider_libmpeg3.c
2007-03-09 10:40:28.000000000 +0100
+@@ -1051,6 +1051,7 @@
+ {
+ mpeg3_t *q;
+ char *filename;
++ int error_code;
+
+ if (!ctx->filename)
+ return DFB_UNSUPPORTED;
+@@ -1062,8 +1063,9 @@
+ return DFB_UNSUPPORTED;
+ }
+
+- q = mpeg3_open( filename );
+- if (!q) {
++ q = mpeg3_open( filename, &error_code );
++ if (!q || error_code) {
++ D_ERROR( "Libmpeg3 Provider: Error opening video file!\n" );
+ D_FREE( filename );
+ return DFB_UNSUPPORTED;
+ }
+@@ -1084,7 +1086,7 @@
+ static DFBResult
+ Construct( IDirectFBVideoProvider *thiz, IDirectFBDataBuffer *buffer )
+ {
+- int i;
++ int i, error_code;
+ IDirectFBDataBuffer_data *buffer_data;
+
+ DIRECT_ALLOCATE_INTERFACE_DATA(thiz, IDirectFBVideoProvider_Libmpeg3)
+@@ -1103,7 +1105,7 @@
+
+
+ /* open mpeg3 file */
+- data->file = mpeg3_open( data->filename );
++ data->file = mpeg3_open( data->filename, &error_code );
+
+ /* fetch information about video */
+ data->video.width = mpeg3_video_width( data->file, 0 );
================================================================
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
