diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-16 22:29:55 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2003-01-16 22:29:55 +0000 |
| commit | 71a38bc1b23392caaca7169223a9b22205714c83 (patch) | |
| tree | ecf754f417aabb064f751fb04b618e6b3a6b6f0e | |
| parent | 55f9a4782bea7a85936b9b2ef3a5a3ddb6fbcde2 (diff) | |
| download | xine-lib-71a38bc1b23392caaca7169223a9b22205714c83.tar.gz xine-lib-71a38bc1b23392caaca7169223a9b22205714c83.tar.bz2 | |
i said i wouldn't try fix the win32 breakage from last guenter's commit...
so just two trivial things:
- don't segfault on vfw loading (although vfw support is still broken)
- make acm work again.
CVS patchset: 3939
CVS date: 2003/01/16 22:29:55
| -rw-r--r-- | src/libw32dll/w32codec.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 33f4356ea..d35602f07 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.115 2003/01/08 01:02:30 miguelfreitas Exp $ + * $Id: w32codec.c,v 1.116 2003/01/16 22:29:55 miguelfreitas Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -495,7 +495,7 @@ static void w32v_init_codec (w32v_decoder_t *this, int buf_type) { outfmt = IMGFMT_YUY2; } - this->hic = ICOpen (mmioFOURCC('v','i','d','c'), + this->hic = ICOpen ((int)win32_codec_name, this->bih->biCompression, ICMODE_FASTDECOMPRESS); @@ -1108,6 +1108,8 @@ static int w32a_init_audio (w32a_decoder_t *this, buf_element_t *buf ) { if( this->driver_type == DRIVER_STD ) { + MSACM_RegisterDriver(win32_codec_name, in_fmt->wFormatTag, 0); + ret=acmStreamOpen(&this->srcstream,(HACMDRIVER)NULL, in_fmt, &wf, |