eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-17 20:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Hack libmpcodecs to make it buildable.

Browse Source
This commit is contained in:
Michael Niedermayer
2011-01-14 04:59:35 +01:00
parent 8e45c103e9
commit 3be78f7ecd
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/libmpcodecs/libvo/video_out.h
View File

@@ -27,7 +27,7 @@
#include <stdarg.h> #include <stdarg.h>
//#include "sub/font_load.h" //#include "sub/font_load.h"
#include "libmpcodecs/img_format.h" #include "../img_format.h"
//#include "vidix/vidix.h" //#include "vidix/vidix.h"
#define VO_EVENT_EXPOSE 1 #define VO_EVENT_EXPOSE 1

6
libavfilter/libmpcodecs/mp_image.c
View File

@@ -26,11 +26,11 @@
#include <malloc.h> #include <malloc.h>
#endif #endif
#include "libmpcodecs/img_format.h" #include "img_format.h"
#include "libmpcodecs/mp_image.h" #include "mp_image.h"
#include "libvo/fastmemcpy.h" #include "libvo/fastmemcpy.h"
#include "libavutil/mem.h" //#include "libavutil/mem.h"
void mp_image_alloc_planes(mp_image_t *mpi) { void mp_image_alloc_planes(mp_image_t *mpi) {
// IF09 - allocate space for 4. plane delta info - unused // IF09 - allocate space for 4. plane delta info - unused

10
libavfilter/libmpcodecs/mp_image.h
View File

@@ -22,7 +22,17 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#undef printf //FIXME
#undef fprintf //FIXME
#include "mp_msg.h" #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) --------- //--------- codec's requirements (filled by the codec/vf) ---------

6
libavfilter/libmpcodecs/vf.h
View File

@@ -19,11 +19,11 @@
#ifndef MPLAYER_VF_H #ifndef MPLAYER_VF_H
#define MPLAYER_VF_H #define MPLAYER_VF_H
#include "m_option.h" //#include "m_option.h"
#include "mp_image.h" #include "mp_image.h"
extern m_obj_settings_t* vf_settings; //extern m_obj_settings_t* vf_settings;
extern const m_obj_list_t vf_obj_list; //extern const m_obj_list_t vf_obj_list;
struct vf_instance; struct vf_instance;
struct vf_priv_s; struct vf_priv_s;