Re: [MPlayer-dev-eng] [RFC] build from a single ffmpeg subdirectory

[Diego Biurrun <diego@xxxxxxxxxx>]

On Mon, Oct 13, 2008 at 11:17:30PM +0200, Diego Biurrun wrote:
> 
> Here is an overhaul to the way we integrate FFmpeg with MPlayer.  It
> switches over from multiple subdirectories (and corresponding svn
> externals) to a single subdirectory for all of FFmpeg.  MPlayer's
> configure calls FFmpeg's configure and FFmpeg is built separately from
> the MPlayer build process.

Here is a small addition to get the Zoran code to compile and get rid of
HAVE_AV_CONFIG_H declaration hacks.

Note that the Zoran code is a horrible mess of duplicated code...

Diego

Index: libmpcodecs/vf_zrmjpeg.c
===================================================================
--- libmpcodecs/vf_zrmjpeg.c	(revision 27769)
+++ libmpcodecs/vf_zrmjpeg.c	(working copy)
@@ -44,17 +44,8 @@
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
-
-/* We need this #define because we need ../libavcodec/common.h to #define
- * be2me_32, otherwise the linker will complain that it doesn't exist */
-#define HAVE_AV_CONFIG_H
-#include "libavcodec/avcodec.h"
 #include "libavcodec/mjpegenc.h"
-//#include "jpeg_enc.h" /* this file is not present yet */
 
-#undef malloc
-#undef free
-
 /* some convenient #define's, is this portable enough? */
 /// Printout  with vf_zrmjpeg: prefix at VERBOSE level
 #define VERBOSE(...) mp_msg(MSGT_DECVIDEO, MSGL_V, "vf_zrmjpeg: " __VA_ARGS__)
Index: libvo/jpeg_enc.c
===================================================================
--- libvo/jpeg_enc.c	(revision 27769)
+++ libvo/jpeg_enc.c	(working copy)
@@ -30,14 +30,10 @@
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include "config.h"
 #include "mp_msg.h"
-/* We need this #define because we need ../libavcodec/common.h to #define 
- * be2me_32, otherwise the linker will complain that it doesn't exist */
-#define HAVE_AV_CONFIG_H
 #include "libavcodec/avcodec.h"
-#include "libavcodec/dsputil.h"
-#include "libavcodec/mpegvideo.h"
 #include "libavcodec/mjpegenc.h"
 
 #include "jpeg_enc.h"

_______________________________________________
MPlayer-dev-eng mailing list
MPlayer-dev-eng@xxxxxxxxxxxx
https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng