Browse Source

Hack libmpcodecs to make it buildable.

tags/n0.8
Michael Niedermayer 15 years ago
parent
commit
3be78f7ecd
4 changed files with 17 additions and 7 deletions
  1. +1
    -1
      libavfilter/libmpcodecs/libvo/video_out.h
  2. +3
    -3
      libavfilter/libmpcodecs/mp_image.c
  3. +10
    -0
      libavfilter/libmpcodecs/mp_image.h
  4. +3
    -3
      libavfilter/libmpcodecs/vf.h

+ 1
- 1
libavfilter/libmpcodecs/libvo/video_out.h View File

@@ -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


+ 3
- 3
libavfilter/libmpcodecs/mp_image.c View File

@@ -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


+ 10
- 0
libavfilter/libmpcodecs/mp_image.h View File

@@ -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) ---------



+ 3
- 3
libavfilter/libmpcodecs/vf.h View File

@@ -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;


Loading…
Cancel
Save