From 9c4ee906d1cc4487be898342d07690f207e35f90 Mon Sep 17 00:00:00 2001
From: Mike Melanson <mike@multimedia.cx>
Date: Tue, 9 Mar 2004 04:09:41 +0000
Subject: hook up ffmpeg's Flash Video support

CVS patchset: 6237
CVS date: 2004/03/09 04:09:41
---
 src/libffmpeg/video_decoder.c | 6 ++++--
 src/libffmpeg/xine_decoder.c  | 3 ++-
 src/xine-engine/buffer.h      | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c
index 916bfc956..cbf080052 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.9 2004/03/03 20:09:13 mroi Exp $
+ * $Id: video_decoder.c,v 1.10 2004/03/09 04:09:41 tmmm Exp $
  *
  * xine video decoder plugin using ffmpeg
  *
@@ -790,7 +790,8 @@ static const ff_codec_t ff_video_lookup[] = {
   {BUF_VIDEO_MSZH,        CODEC_ID_MSZH,       "MSZH Video (ffmpeg)"},
   {BUF_VIDEO_ASV1,        CODEC_ID_ASV1,       "ASV v1 Video (ffmpeg)"},
   {BUF_VIDEO_ASV2,        CODEC_ID_ASV2,       "ASV v2 Video (ffmpeg)"},
-  {BUF_VIDEO_ATIVCR1,     CODEC_ID_VCR1,       "ATI VCR-1 (ffmpeg)"} };
+  {BUF_VIDEO_ATIVCR1,     CODEC_ID_VCR1,       "ATI VCR-1 (ffmpeg)"},
+  {BUF_VIDEO_FLV1,        CODEC_ID_FLV1,       "Flash Video (ffmpeg)"} };
 
 static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
   ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen;
@@ -1268,6 +1269,7 @@ static uint32_t supported_video_types[] = {
   BUF_VIDEO_ASV1,
   BUF_VIDEO_ASV2,
   BUF_VIDEO_ATIVCR1,
+  BUF_VIDEO_FLV1,
   0 
 };
 
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index d5d10d0fe..a5b4ffeef 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_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: xine_decoder.c,v 1.157 2004/02/03 04:27:18 tmmm Exp $
+ * $Id: xine_decoder.c,v 1.158 2004/03/09 04:09:41 tmmm Exp $
  *
  * xine decoder plugin using ffmpeg
  *
@@ -112,6 +112,7 @@ void avcodec_register_all(void)
     register_avcodec(&asv1_decoder);
     register_avcodec(&asv2_decoder);
     register_avcodec(&vcr1_decoder);
+    register_avcodec(&flv_decoder);
 }
 
 void init_once_routine(void) {
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 57fc47de1..255c867e8 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.135 2004/02/12 18:27:21 mroi Exp $
+ * $Id: buffer.h,v 1.136 2004/03/09 04:09:42 tmmm Exp $
  *
  *
  * contents:
@@ -165,6 +165,7 @@ extern "C" {
 #define BUF_VIDEO_ASV2		0x02490000
 #define BUF_VIDEO_BITPLANE	0x024A0000 /* Amiga typical picture and animation format */
 #define BUF_VIDEO_BITPLANE_BR1	0x024B0000 /* the same with Bytrun compression 1 */
+#define BUF_VIDEO_FLV1		0x024C0000
 
 /* audio buffer types:  (please keep in sync with buffer_types.c) */
 
-- 
cgit v1.2.3