diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2003-08-31 17:27:28 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2003-08-31 17:27:28 +0000 |
| commit | 10e352807afbb4d3a0b6563d52c46d4cf65f7f10 (patch) | |
| tree | c0507db054f72e93dfbe94034c49b9d8ed60cace /src | |
| parent | 40a66ac25ad62bda86922c546ea4dfb854ba9df9 (diff) | |
| download | xine-lib-10e352807afbb4d3a0b6563d52c46d4cf65f7f10.tar.gz xine-lib-10e352807afbb4d3a0b6563d52c46d4cf65f7f10.tar.bz2 | |
support for vp4, requires vp4vfw.dll
CVS patchset: 5321
CVS date: 2003/08/31 17:27:28
Diffstat (limited to 'src')
| -rw-r--r-- | src/libw32dll/w32codec.c | 12 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 10 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 5742846a1..5a2f5aea6 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.125 2003/08/04 03:47:10 miguelfreitas Exp $ + * $Id: w32codec.c,v 1.126 2003/08/31 17:27:28 jstembridge Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -440,9 +440,16 @@ static char* get_vids_codec_name(w32v_decoder_t *this, this->ex_functions=1; this->flipped=1; this->stream->meta_info[XINE_META_INFO_VIDEOCODEC] - = strdup ("VP 31 (win32)"); + = strdup ("On2 VP3.1 (win32)"); return "vp31vfw.dll"; + case BUF_VIDEO_VP4: + this->yuv_supported=1; + this->ex_functions=1; + this->stream->meta_info[XINE_META_INFO_VIDEOCODEC] + = strdup ("On2 VP4 (win32)"); + return "vp4vfw.dll"; + case BUF_VIDEO_MSS1: this->driver_type = DRIVER_DS; this->guid=&mss1_clsid; @@ -1602,6 +1609,7 @@ static uint32_t video_types[] = { BUF_VIDEO_ATIVCR2, BUF_VIDEO_I263, BUF_VIDEO_MSVC, BUF_VIDEO_DV, BUF_VIDEO_WMV7, BUF_VIDEO_WMV8, BUF_VIDEO_WMV9, BUF_VIDEO_VP31, BUF_VIDEO_MSS1, BUF_VIDEO_TSCC, BUF_VIDEO_UCOD, + BUF_VIDEO_VP4, 0 }; diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 730b883be..ae0333510 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.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: buffer_types.c,v 1.66 2003/05/31 02:18:01 tmmm Exp $ + * $Id: buffer_types.c,v 1.67 2003/08/31 17:27:28 jstembridge Exp $ * * * contents: @@ -355,6 +355,14 @@ static video_db_t video_db[] = { }, { { + meFOURCC('V','P','4','0'), + 0, + }, + BUF_VIDEO_VP4, + "On2 VP4" +}, +{ + { meFOURCC('H', '2', '6', '3'), meFOURCC('h', '2', '6', '3'), meFOURCC('U', '2', '6', '3'), |