diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-01 17:56:05 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-07-01 17:56:05 +0000 |
| commit | 55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2 (patch) | |
| tree | a75e2ca408aa1dea4eab0ae04b34408cbc261011 /src/libw32dll/w32codec.c | |
| parent | e7eb5eea39cb19a939a519828be0879ba58d1805 (diff) | |
| download | xine-lib-55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2.tar.gz xine-lib-55b973ab9dde41cbc9d70e2cb9cb1365ec4ad5a2.tar.bz2 | |
enable ffmpeg's msmpeg4 v1/v2.
note: i don't have any v1 streams to test. v2 are working fine though.
CVS patchset: 2189
CVS date: 2002/07/01 17:56:05
Diffstat (limited to 'src/libw32dll/w32codec.c')
| -rw-r--r-- | src/libw32dll/w32codec.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 93787eeae..90926b27e 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.c @@ -17,13 +17,13 @@ * 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.82 2002/06/21 01:44:17 miguelfreitas Exp $ + * $Id: w32codec.c,v 1.83 2002/07/01 17:56:05 miguelfreitas Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) * */ - + #include <stdlib.h> #include <stdio.h> #include <inttypes.h> @@ -285,7 +285,8 @@ static char* get_vids_codec_name(w32v_decoder_t *this, buf_type &= 0xffff0000; switch (buf_type) { - case BUF_VIDEO_MSMPEG4_V12: + case BUF_VIDEO_MSMPEG4_V1: + case BUF_VIDEO_MSMPEG4_V2: /* Microsoft MPEG-4 v1/v2 */ /* old dll is disabled now due segfaults * (using directshow instead) @@ -403,9 +404,10 @@ static char* get_vids_codec_name(w32v_decoder_t *this, static int w32v_can_handle (video_decoder_t *this_gen, int buf_type) { buf_type &= 0xFFFF0000; - return ( buf_type == BUF_VIDEO_MSMPEG4_V12 || - buf_type == BUF_VIDEO_MSMPEG4_V3 || - buf_type == BUF_VIDEO_IV50 || + return ( buf_type == BUF_VIDEO_MSMPEG4_V1 || + buf_type == BUF_VIDEO_MSMPEG4_V2 || + buf_type == BUF_VIDEO_MSMPEG4_V3 || + buf_type == BUF_VIDEO_IV50 || buf_type == BUF_VIDEO_IV41 || buf_type == BUF_VIDEO_IV32 || buf_type == BUF_VIDEO_IV31 || |