Update of /cvsroot/xine/xine-lib/src/libffmpeg
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5335/src/libffmpeg
Modified Files:
Tag: ffmpeg_integration
Makefile.am dvaudio_decoder.c video_decoder.c xine_decoder.h
Removed Files:
Tag: ffmpeg_integration
diff_to_ffmpeg_cvs.txt
Log Message:
Start working on a branch where FFmpeg is not copied, patched and carved to be
built with automake but instead imported inline and built using its own build
system. This is an import of a slightly modified FFmpeg current tree. xine-lib
builds, install and run fine with it, but there are of course plenty of things
that needs to be fixed before it can even be considered for a 1.2.x series.
Work will continue in the next days of course.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -u -r1.47 -r1.47.2.1
--- Makefile.am 12 Sep 2006 00:06:05 -0000 1.47
+++ Makefile.am 2 Dec 2006 01:20:07 -0000 1.47.2.1
@@ -4,12 +4,22 @@
AM_CFLAGS = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS)
link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS)
else
-ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavutil
+ff_cppflags = -I$(top_srcdir)/contrib/ffmpeg/libavutil \
+ -I$(top_srcdir)/contrib/ffmpeg/libavcodec \
+ -I$(top_srcdir)/contrib/ffmpeg/libpostproc
link_ffmpeg = \
- $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
- $(top_builddir)/src/libffmpeg/libavutil/libavutil.la \
- $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la
-SUBDIRS = libavcodec libavutil
+ $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a \
+ $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a \
+ $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a
+
+$(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a:
+ $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine
libavcodec/libavcodec.a
+
+$(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a:
+ $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine
libavutil/libavutil.a
+
+$(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a:
+ $(MAKE) -C $(top_builddir)/contrib/ffmpeg/ -f makefile.xine
libpostproc/libpostproc.a
endif
# this must always be included, even if the current machine has no DXR3...
Index: dvaudio_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/dvaudio_decoder.c,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -r1.11 -r1.11.2.1
--- dvaudio_decoder.c 10 Jul 2006 22:08:29 -0000 1.11
+++ dvaudio_decoder.c 2 Dec 2006 01:20:07 -0000 1.11.2.1
@@ -55,13 +55,8 @@
# undef uint64_t
#endif
-#ifdef HAVE_FFMPEG
-# include <avcodec.h>
-# include "libavcodec/dvdata.h"
-#else
-# include "libavcodec/avcodec.h"
-# include "libavcodec/dvdata.h"
-#endif
+#include <avcodec.h>
+#include <dvdata.h> /* This is not installed by FFmpeg, its usage has to be
cleared up */
#ifdef _MSC_VER
# undef malloc
@@ -96,23 +91,6 @@
} dvaudio_decoder_t;
-
-enum dv_pack_type {
- dv_header525 = 0x3f, /* see dv_write_pack for important details on */
- dv_header625 = 0xbf, /* these two packs */
- dv_timecode = 0x13,
- dv_audio_source = 0x50,
- dv_audio_control = 0x51,
- dv_audio_recdate = 0x52,
- dv_audio_rectime = 0x53,
- dv_video_source = 0x60,
- dv_video_control = 0x61,
- dv_viedo_recdate = 0x62,
- dv_video_rectime = 0x63,
- dv_unknown_pack = 0xff,
-};
-
-
/*
* This is the dumbest implementation of all -- it simply looks at
* a fixed offset and if pack isn't there -- fails. We might want
Index: video_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/video_decoder.c,v
retrieving revision 1.63
retrieving revision 1.63.2.1
diff -u -r1.63 -r1.63.2.1
--- video_decoder.c 18 Sep 2006 18:56:56 -0000 1.63
+++ video_decoder.c 2 Dec 2006 01:20:07 -0000 1.63.2.1
@@ -47,11 +47,7 @@
#include "xine_decoder.h"
#include "mpeg_parser.h"
-#ifdef HAVE_FFMPEG
-# include <postprocess.h>
-#else
-# include "libavcodec/libpostproc/postprocess.h"
-#endif
+#include <postprocess.h>
#define VIDEOBUFSIZE (128*1024)
#define SLICE_BUFFER_SIZE (1194*1024)
Index: xine_decoder.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/xine_decoder.h,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -r1.7 -r1.7.2.1
--- xine_decoder.h 2 Aug 2006 07:15:27 -0000 1.7
+++ xine_decoder.h 2 Dec 2006 01:20:07 -0000 1.7.2.1
@@ -28,11 +28,7 @@
#include "config.h"
#endif
-#ifdef HAVE_FFMPEG
-# include <avcodec.h>
-#else
-# include "libavcodec/avcodec.h"
-#endif
+#include <avcodec.h>
typedef struct ff_codec_s {
uint32_t type;
--- diff_to_ffmpeg_cvs.txt DELETED ---
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
