diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2004-09-14 02:22:23 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2004-09-14 02:22:23 +0000 |
| commit | 0cb901ef91b174fb6602e35d7183d5be96d5843b (patch) | |
| tree | 128b7357a352d7155d4efc26bee7b3736e2fa570 | |
| parent | 8033da767dbbecc06c2fc19546cf5d1b762768bf (diff) | |
| download | xine-lib-0cb901ef91b174fb6602e35d7183d5be96d5843b.tar.gz xine-lib-0cb901ef91b174fb6602e35d7183d5be96d5843b.tar.bz2 | |
- Add support for 3ivx video (doesn't work in QT streams yet)
CVS patchset: 6969
CVS date: 2004/09/14 02:22:23
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 8 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 3 |
3 files changed, 8 insertions, 5 deletions
@@ -32,7 +32,7 @@ xine-lib (1-rc6) * Fixed wrong, very bright overlays on some DVDs [bug #1018193] * Fixed WIN32 replacement of gettimeofday [bug #995961] * Removed unistd.h from public header - * Added support for H.264/AVC video + * Added support for H.264/AVC video, and 3ivx video xine-lib (1-rc5) * add support for ejecting removable media on Solaris diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index 71dd359cf..d3e6138ac 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.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: video_decoder.c,v 1.30 2004/09/12 16:07:57 mroi Exp $ + * $Id: video_decoder.c,v 1.31 2004/09/14 02:22:30 hadess Exp $ * * xine video decoder plugin using ffmpeg * @@ -654,8 +654,9 @@ static const ff_codec_t ff_video_lookup[] = { {BUF_VIDEO_WMV7, CODEC_ID_WMV1, "MS Windows Media Video 7 (ffmpeg)"}, {BUF_VIDEO_WMV8, CODEC_ID_WMV2, "MS Windows Media Video 8 (ffmpeg)"}, {BUF_VIDEO_MPEG4, CODEC_ID_MPEG4, "ISO MPEG-4 (ffmpeg)"}, - {BUF_VIDEO_XVID, CODEC_ID_MPEG4, "ISO MPEG-4 (ffmpeg)"}, - {BUF_VIDEO_DIVX5, CODEC_ID_MPEG4, "ISO MPEG-4 (ffmpeg)"}, + {BUF_VIDEO_XVID, CODEC_ID_MPEG4, "ISO MPEG-4 (XviD, ffmpeg)"}, + {BUF_VIDEO_DIVX5, CODEC_ID_MPEG4, "ISO MPEG-4 (DivX5, ffmpeg)"}, + {BUF_VIDEO_3IVX, CODEC_ID_MPEG4, "ISO MPEG-4 (3ivx, ffmpeg)"}, {BUF_VIDEO_JPEG, CODEC_ID_MJPEG, "Motion JPEG (ffmpeg)"}, {BUF_VIDEO_MJPEG, CODEC_ID_MJPEG, "Motion JPEG (ffmpeg)"}, {BUF_VIDEO_I263, CODEC_ID_H263I, "ITU H.263 (ffmpeg)"}, @@ -1256,6 +1257,7 @@ static uint32_t supported_video_types[] = { BUF_VIDEO_MPEG4, BUF_VIDEO_XVID, BUF_VIDEO_DIVX5, + BUF_VIDEO_3IVX, BUF_VIDEO_MJPEG, BUF_VIDEO_H263, BUF_VIDEO_RV10, diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 411e02fec..35c9d420b 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.85 2004/09/03 13:56:04 mroi Exp $ + * $Id: buffer_types.c,v 1.86 2004/09/14 02:22:29 hadess Exp $ * * * contents: @@ -177,6 +177,7 @@ static video_db_t video_db[] = { { { meFOURCC('3', 'I', 'V', '1'), + meFOURCC('3', 'I', 'V', '2'), 0 }, BUF_VIDEO_3IVX, |