diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-01-14 04:59:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-01-20 00:59:30 +0100 |
| commit | 3be78f7ecdbfaed8d4c9760676eb6d92ab600e38 (patch) | |
| tree | f373a189667b4abbdd08ad9350914d9f8ca533a0 /libavfilter | |
| parent | 8e45c103e9578abfa52c7bd85ec75b288d151e54 (diff) | |
| download | ffmpeg-3be78f7ecdbfaed8d4c9760676eb6d92ab600e38.tar.gz | |
Hack libmpcodecs to make it buildable.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/libmpcodecs/libvo/video_out.h | 2 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/mp_image.c | 6 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/mp_image.h | 10 | ||||
| -rw-r--r-- | libavfilter/libmpcodecs/vf.h | 6 |
4 files changed, 17 insertions, 7 deletions
diff --git a/libavfilter/libmpcodecs/libvo/video_out.h b/libavfilter/libmpcodecs/libvo/video_out.h index cbbea66445..77b0229991 100644 --- a/libavfilter/libmpcodecs/libvo/video_out.h +++ b/libavfilter/libmpcodecs/libvo/video_out.h @@ -27,7 +27,7 @@ #include <stdarg.h> //#include "sub/font_load.h" -#include "libmpcodecs/img_format.h" +#include "../img_format.h" //#include "vidix/vidix.h" #define VO_EVENT_EXPOSE 1 diff --git a/libavfilter/libmpcodecs/mp_image.c b/libavfilter/libmpcodecs/mp_image.c index 397bebfa00..bd6d33fe0a 100644 --- a/libavfilter/libmpcodecs/mp_image.c +++ b/libavfilter/libmpcodecs/mp_image.c @@ -26,11 +26,11 @@ #include <malloc.h> #endif -#include "libmpcodecs/img_format.h" -#include "libmpcodecs/mp_image.h" +#include "img_format.h" +#include "mp_image.h" #include "libvo/fastmemcpy.h" -#include "libavutil/mem.h" +//#include "libavutil/mem.h" void mp_image_alloc_planes(mp_image_t *mpi) { // IF09 - allocate space for 4. plane delta info - unused diff --git a/libavfilter/libmpcodecs/mp_image.h b/libavfilter/libmpcodecs/mp_image.h index 7c56880bb6..02c78482a2 100644 --- a/libavfilter/libmpcodecs/mp_image.h +++ b/libavfilter/libmpcodecs/mp_image.h @@ -22,7 +22,17 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#undef printf //FIXME +#undef fprintf //FIXME #include "mp_msg.h" +#include "libavutil/avutil.h" +#include "libavutil/avassert.h" +#undef realloc +#undef malloc +#undef free +#undef rand +#undef srand +#undef printf //--------- codec's requirements (filled by the codec/vf) --------- diff --git a/libavfilter/libmpcodecs/vf.h b/libavfilter/libmpcodecs/vf.h index 3619e699f1..9119b6209d 100644 --- a/libavfilter/libmpcodecs/vf.h +++ b/libavfilter/libmpcodecs/vf.h @@ -19,11 +19,11 @@ #ifndef MPLAYER_VF_H #define MPLAYER_VF_H -#include "m_option.h" +//#include "m_option.h" #include "mp_image.h" -extern m_obj_settings_t* vf_settings; -extern const m_obj_list_t vf_obj_list; +//extern m_obj_settings_t* vf_settings; +//extern const m_obj_list_t vf_obj_list; struct vf_instance; struct vf_priv_s; |