diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-16 16:18:25 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-07-16 16:18:25 +0000 |
commit | e870f84bfba4ba9830c78f347e72805cd227d068 (patch) | |
tree | 1aab5e4b76ab0bd2905ade6f9eab34231086f94c | |
parent | fad0b588c2824b84449f04b9b69acb50742d3519 (diff) | |
download | mpv-e870f84bfba4ba9830c78f347e72805cd227d068.tar.bz2 mpv-e870f84bfba4ba9830c78f347e72805cd227d068.tar.xz |
Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.h
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27301 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdemux/demux_asf.c | 7 | ||||
-rw-r--r-- | libmpdemux/demux_real.c | 6 | ||||
-rw-r--r-- | libmpdemux/demux_viv.c | 6 | ||||
-rw-r--r-- | libmpdemux/demuxer.h | 8 | ||||
-rw-r--r-- | libmpdemux/video.c | 6 |
5 files changed, 7 insertions, 26 deletions
diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 72a1d98e2e..d007ae1a3e 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -79,13 +79,6 @@ static void init_priv (struct asf_priv* asf){ asf->vid_ext_frame_index=-1; } -#ifdef USE_LIBAVCODEC -#include "libavcodec/avcodec.h" -#else -#define FF_INPUT_BUFFER_PADDING_SIZE 8 -#endif - - static void demux_asf_append_to_packet(demux_packet_t* dp,unsigned char *data,int len,int offs) { if(dp->len!=offs && offs!=-1) mp_msg(MSGT_DEMUX,MSGL_V,"warning! fragment.len=%d BUT next fragment offset=%d \n",dp->len,offs); diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index d48af16413..3490501302 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -33,12 +33,6 @@ Video codecs: (supported by RealPlayer8 for Linux) #include "demuxer.h" #include "stheader.h" -#ifdef USE_LIBAVCODEC -#include "libavcodec/avcodec.h" -#else -#define FF_INPUT_BUFFER_PADDING_SIZE 8 -#endif - //#define mp_dbg(mod,lev, args... ) mp_msg_c((mod<<8)|lev, ## args ) #define MKTAG(a, b, c, d) (a | (b << 8) | (c << 16) | (d << 24)) diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 46ff28841d..7ee2332e27 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -14,12 +14,6 @@ #include "demuxer.h" #include "stheader.h" -#ifdef USE_LIBAVCODEC -#include "libavcodec/avcodec.h" -#else -#define FF_INPUT_BUFFER_PADDING_SIZE 8 -#endif - /* parameters ! */ int vivo_param_version = -1; char *vivo_param_acodec = NULL; diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index a2464c7390..76942a3aed 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -93,6 +93,12 @@ #define SEEK_ABSOLUTE (1 << 0) #define SEEK_FACTOR (1 << 1) +#ifdef USE_LIBAVCODEC +#include "libavcodec/avcodec.h" +#else +#define FF_INPUT_BUFFER_PADDING_SIZE 8 +#endif + // Holds one packet/frame/whatever typedef struct demux_packet_st { int len; @@ -243,7 +249,7 @@ static inline demux_packet_t* new_demux_packet(int len){ dp->refcount=1; dp->master=NULL; dp->buffer=NULL; - if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8))) + if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + FF_INPUT_BUFFER_PADDING_SIZE))) memset(dp->buffer + len, 0, 8); else dp->len = 0; diff --git a/libmpdemux/video.c b/libmpdemux/video.c index b0f72c515f..cd061acc1c 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -22,12 +22,6 @@ /* sub_cc (closed captions)*/ #include "sub_cc.h" -#ifdef USE_LIBAVCODEC -#include "libavcodec/avcodec.h" -#else -#define FF_INPUT_BUFFER_PADDING_SIZE 8 -#endif - /* biCompression constant */ #define BI_RGB 0L |