summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-16 14:08:24 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-07-16 14:08:24 +0100
commitf1382ea01b368dc1d8044b368f602aad87f6468e (patch)
treea9d12b0b8dfe052d17c142fe5e8eefe415b40043
parent2dc2dea3f814ef273456136083fa726dce23e24b (diff)
downloadxine-lib-f1382ea01b368dc1d8044b368f602aad87f6468e.tar.gz
xine-lib-f1382ea01b368dc1d8044b368f602aad87f6468e.tar.bz2
Add support for the Snow video codec.
-rw-r--r--ChangeLog1
-rw-r--r--src/combined/ffmpeg/ff_video_decoder.c4
-rw-r--r--src/xine-engine/buffer.h1
-rw-r--r--src/xine-engine/buffer_types.c8
4 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a5aee5a4c..b70acf6b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@ xine-lib (1.1.15) 2008-??-??
* Use external ffmpeg by default.
* V4L: Don't segfault if asked for an input that doesn't exist
* Recognise AMR audio (normally found in 3GP files).
+ * Recognise Snow video.
xine-lib (1.1.14) 2008-06-29
* DVB changes:
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 3ea08417e..ac101d77e 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -321,6 +321,7 @@ static const ff_codec_t ff_video_lookup[] = {
{BUF_VIDEO_CAVS, CODEC_ID_CAVS, "Chinese AVS (ffmpeg)"},
{BUF_VIDEO_VMNC, CODEC_ID_VMNC, "VMware Screen Codec (ffmpeg)"},
{BUF_VIDEO_THEORA_RAW, CODEC_ID_THEORA, "Theora (ffmpeg)"},
+ {BUF_VIDEO_SNOW, CODEC_ID_SNOW, "Snow (ffmpeg)"},
};
static const char *const skip_loop_filter_enum_names[] = {
@@ -1892,6 +1893,9 @@ static uint32_t supported_video_types[] = {
#ifdef CONFIG_VMNC_DECODER
BUF_VIDEO_VMNC,
#endif
+ #ifdef CONFIG_SNOW_DECODER
+ BUF_VIDEO_SNOW,
+ #endif
BUF_VIDEO_THEORA_RAW,
0
};
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 97df4d2ae..4176b89e5 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -192,6 +192,7 @@ extern "C" {
#define BUF_VIDEO_THEORA_RAW 0x02640000
#define BUF_VIDEO_VC1 0x02650000
#define BUF_VIDEO_VMNC 0x02660000
+#define BUF_VIDEO_SNOW 0x02670000
/* audio buffer types: (please keep in sync with buffer_types.c) */
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index e454a0fe2..911e123ed 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -779,6 +779,14 @@ static const video_db_t video_db[] = {
BUF_VIDEO_VMNC,
"VMware Screen Codec"
},
+{
+ {
+ ME_FOURCC('S','N','O','W'),
+ 0
+ },
+ BUF_VIDEO_SNOW,
+ "Snow"
+},
{ { 0 }, 0, "last entry" }
};