From 0ea721f7ce81357bc4ec6eea609cd50482c3d15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?= Date: Sat, 2 Dec 2006 01:19:48 +0000 Subject: 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. CVS patchset: 8397 CVS date: 2006/12/02 01:19:48 --- src/libffmpeg/video_decoder.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'src/libffmpeg/video_decoder.c') diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index 8f6f70ab9..2d5733211 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.63 2006/09/18 18:56:56 tmattern Exp $ + * $Id: video_decoder.c,v 1.63.2.1 2006/12/02 01:20:07 dgp85 Exp $ * * xine video decoder plugin using ffmpeg * @@ -47,11 +47,7 @@ #include "xine_decoder.h" #include "mpeg_parser.h" -#ifdef HAVE_FFMPEG -# include -#else -# include "libavcodec/libpostproc/postprocess.h" -#endif +#include #define VIDEOBUFSIZE (128*1024) #define SLICE_BUFFER_SIZE (1194*1024) -- cgit v1.2.3