From 793816cfd30d99a2aacc914cd71922c17cad1d37 Mon Sep 17 00:00:00 2001
From: Claudio Ciccani <klan@users.sourceforge.net>
Date: Sun, 14 Jan 2007 16:53:37 +0000
Subject: Added BUF_VIDEO_VP6F (Flash VP6). The only difference with the
 standard VP6 codec is that the image is not flipped upside-down.

CVS patchset: 8507
CVS date: 2007/01/14 16:53:37
---
 src/libffmpeg/video_decoder.c | 4 +++-
 src/xine-engine/buffer.h      | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index b019d52d3..f4bde4cde 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.65 2007/01/13 21:19:52 miguelfreitas Exp $
+ * $Id: video_decoder.c,v 1.66 2007/01/14 16:53:37 klan Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -263,6 +263,7 @@ static const ff_codec_t ff_video_lookup[] = {
   {BUF_VIDEO_VP31,        CODEC_ID_VP3,       "On2 VP3.1 (ffmpeg)"},
   {BUF_VIDEO_VP5,         CODEC_ID_VP5,       "On2 VP5 (ffmpeg)"},
   {BUF_VIDEO_VP6,         CODEC_ID_VP6,       "On2 VP6 (ffmpeg)"},
+  {BUF_VIDEO_VP6F,        CODEC_ID_VP6F,      "On2 VP6 (ffmepg)"},
   {BUF_VIDEO_4XM,         CODEC_ID_4XM,       "4X Video (ffmpeg)"},
   {BUF_VIDEO_CINEPAK,     CODEC_ID_CINEPAK,   "Cinepak (ffmpeg)"},
   {BUF_VIDEO_MSVC,        CODEC_ID_MSVIDEO1,  "Microsoft Video 1 (ffmpeg)"},
@@ -1595,6 +1596,7 @@ static uint32_t supported_video_types[] = {
   #endif
   #ifdef CONFIG_VP6_DECODER
   BUF_VIDEO_VP6,
+  BUF_VIDEO_VP6F,
   #endif
   #ifdef CONFIG_4XM_DECODER
   BUF_VIDEO_4XM,
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 22e1a7a04..64fe52a20 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -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.h,v 1.161 2006/12/26 03:18:56 dgp85 Exp $
+ * $Id: buffer.h,v 1.162 2007/01/14 16:53:37 klan Exp $
  *
  *
  * contents:
@@ -190,6 +190,7 @@ extern "C" {
 #define BUF_VIDEO_KMVC		0x02600000
 #define BUF_VIDEO_FLASHSV	0x02610000
 #define BUF_VIDEO_CAVS		0x02620000
+#define BUF_VIDEO_VP6F		0x02630000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
-- 
cgit v1.2.3