diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-10-30 09:42:26 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-10-30 09:42:26 +0000 |
| commit | 793af533ed3bc8f51a7a2b028e824a9de1dc82a0 (patch) | |
| tree | eb25264a107b3ac5735769f0e9bca5377636f34a /src/xine-engine | |
| parent | 5d3e565318b6436aed0927640ac548f88ae05f50 (diff) | |
| download | xine-lib-793af533ed3bc8f51a7a2b028e824a9de1dc82a0.tar.gz xine-lib-793af533ed3bc8f51a7a2b028e824a9de1dc82a0.tar.bz2 | |
make xine recognize the new windows media formats and a small audio output plugin loader bugfix
CVS patchset: 914
CVS date: 2001/10/30 09:42:26
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer.h | 4 | ||||
| -rw-r--r-- | src/xine-engine/load_plugins.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 22c3a86ca..ba2006c12 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.h,v 1.18 2001/10/21 12:09:06 jcdutton Exp $ + * $Id: buffer.h,v 1.19 2001/10/30 09:42:26 guenter Exp $ * * * contents: @@ -92,6 +92,8 @@ extern "C" { #define BUF_VIDEO_RGB 0x02100000 #define BUF_VIDEO_YUY2 0x02110000 #define BUF_VIDEO_JPEG 0x02120000 +#define BUF_VIDEO_WMV7 0x02130000 +#define BUF_VIDEO_WMV8 0x02140000 /* audio buffer types: */ diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 4aa820469..c9ba742db 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.51 2001/10/27 16:12:21 miguelfreitas Exp $ + * $Id: load_plugins.c,v 1.52 2001/10/30 09:42:26 guenter Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -836,7 +836,7 @@ ao_driver_t *xine_load_audio_output_plugin(config_values_t *config, if(!(plugin = dlopen (str, RTLD_LAZY | RTLD_GLOBAL))) { printf("load_plugins: audio output plugin %s failed to link: %s\n", str, dlerror()); - return NULL; + /* return NULL; */ } else { void *(*initplug) (config_values_t *); ao_info_t* (*getinfo) (); |