From 0589f4723951f891c9d7e47dd9e10bfaf6e16f4e Mon Sep 17 00:00:00 2001 From: michael Date: Tue, 15 Jul 2008 00:21:32 +0000 Subject: Remove -std=gnu99/gnu89/default dialect linux define, as it violates the C standard. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27282 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/vcd_read.h | 8 ++++---- vidix/mtrr.c | 2 +- vidix/pci.c | 2 +- vidix/sysdep/AsmMacros_alpha.h | 2 +- vidix/sysdep/AsmMacros_ia64.h | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stream/vcd_read.h b/stream/vcd_read.h index 9cf46fce25..177316ecae 100644 --- a/stream/vcd_read.h +++ b/stream/vcd_read.h @@ -9,11 +9,11 @@ #include "stream.h" #include "libavutil/intreadwrite.h" //=================== VideoCD ========================== -#if defined(linux) || defined(sun) || defined(__bsdi__) +#if defined(__linux__) || defined(sun) || defined(__bsdi__) typedef struct mp_vcd_priv_st mp_vcd_priv_t; -#if defined(linux) +#if defined(__linux__) #include #elif defined(sun) #include @@ -128,7 +128,7 @@ mp_vcd_priv_t* vcd_read_toc(int fd){ } static int vcd_read(mp_vcd_priv_t* vcd,char *mem){ -#if defined(linux) || defined(__bsdi__) +#if defined(__linux__) || defined(__bsdi__) memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf)); if(ioctl(vcd->fd,CDROMREADRAW,vcd->buf)==-1) return 0; // EOF? memcpy(mem,&vcd->buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA); @@ -225,7 +225,7 @@ static int sun_vcd_read(mp_vcd_priv_t* vcd, int *offset) } #endif /*sun*/ -#else /* linux || sun || __bsdi__ */ +#else /* __linux__ || sun || __bsdi__ */ #error vcd is not yet supported on this arch... diff --git a/vidix/mtrr.c b/vidix/mtrr.c index bda566f68e..775af9e437 100644 --- a/vidix/mtrr.c +++ b/vidix/mtrr.c @@ -39,7 +39,7 @@ int mtrr_set_type(unsigned base,unsigned size,int type) { -#ifdef linux +#ifdef __linux__ FILE * mtrr_fd; char * stype; switch(type) diff --git a/vidix/pci.c b/vidix/pci.c index 1d0cc5aa01..ffa91224e1 100644 --- a/vidix/pci.c +++ b/vidix/pci.c @@ -61,7 +61,7 @@ #endif #include "AsmMacros.h" /* OS depended stuff */ -#if defined (linux) +#if defined (__linux__) #include "sysdep/pci_linux.c" #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined(__DragonFly__) #include "sysdep/pci_freebsd.c" diff --git a/vidix/sysdep/AsmMacros_alpha.h b/vidix/sysdep/AsmMacros_alpha.h index e2e3751629..2cc8d01544 100644 --- a/vidix/sysdep/AsmMacros_alpha.h +++ b/vidix/sysdep/AsmMacros_alpha.h @@ -62,7 +62,7 @@ #ifndef MPLAYER_ASMMACROS_ALPHA_H #define MPLAYER_ASMMACROS_ALPHA_H -#if defined (linux) +#if defined (__linux__) #include #elif defined (__FreeBSD__) #include diff --git a/vidix/sysdep/AsmMacros_ia64.h b/vidix/sysdep/AsmMacros_ia64.h index 0e2dc19024..b25cfee4e5 100644 --- a/vidix/sysdep/AsmMacros_ia64.h +++ b/vidix/sysdep/AsmMacros_ia64.h @@ -62,7 +62,7 @@ #ifndef MPLAYER_ASMMACROS_IA64_H #define MPLAYER_ASMMACROS_IA64_H -#if defined(linux) +#if defined(__linux__) #include #else #error This stuff is not ported on your system -- cgit v1.2.3 From 39456b850ade4b779b4111ac6d833d6031b79b47 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 15 Jul 2008 08:18:08 +0000 Subject: Add missing headers to configure checks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27283 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 3a27e201e9..43b1f03439 100755 --- a/configure +++ b/configure @@ -1573,6 +1573,7 @@ if x86 && test "$_runtime_cpudetection" = no ; then if test "$1" = kernel_check ; then echocheck "kernel support of $2" cat > $TMPC < #include void catch() { exit(1); } int main(void) { @@ -3283,6 +3284,7 @@ fi #if sunos echocheck "termcap" if test "$_termcap" = auto ; then cat > $TMPC < int main(void) { tgetent(); return 0; } EOF _termcap=no @@ -5586,6 +5588,7 @@ echocheck "fontconfig" if test "$_fontconfig" = auto ; then cat > $TMPC << EOF #include +#include #include int main(void) { int err = FcInit(); -- cgit v1.2.3 From 0c107a325ef1e16f9ce8ea21701d6dd5bae4090f Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 15 Jul 2008 08:31:43 +0000 Subject: Add missing return statements to configure tests. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27284 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 43b1f03439..cec15b3d26 100755 --- a/configure +++ b/configure @@ -2411,7 +2411,7 @@ echocheck ".align is a power of two" if test "$_asmalign_pot" = auto ; then _asmalign_pot=no cat > $TMPC << EOF -int main(void) { asm (".align 3"); } +int main(void) { asm (".align 3"); return 0; } EOF cc_check && _asmalign_pot=yes fi @@ -2482,7 +2482,7 @@ if arm ; then echocheck "ARMv5TE (Enhanced DSP Extensions)" if test $_armv5te = "auto" ; then cat > $TMPC << EOF -int main(void) { __asm__ __volatile__ ("qadd r0, r0, r0"); } +int main(void) { __asm__ __volatile__ ("qadd r0, r0, r0"); return 0; } EOF _armv5te=no cc_check && _armv5te=yes @@ -2492,7 +2492,7 @@ EOF echocheck "ARMv6 (SIMD instructions)" if test $_armv6 = "auto" ; then cat > $TMPC << EOF -int main(void) { __asm__ __volatile__ ("sadd16 r0, r0, r0"); } +int main(void) { __asm__ __volatile__ ("sadd16 r0, r0, r0"); return 0; } EOF _armv6=no cc_check && _armv6=yes @@ -2502,7 +2502,7 @@ EOF echocheck "iWMMXt (Intel XScale SIMD instructions)" if test $_iwmmxt = "auto" ; then cat > $TMPC << EOF -int main(void) { __asm__ __volatile__ ("wunpckelub wr6, wr4"); } +int main(void) { __asm__ __volatile__ ("wunpckelub wr6, wr4"); return 0; } EOF _iwmmxt=no cc_check && _iwmmxt=yes @@ -2647,7 +2647,7 @@ echores "$_runtime_cpudetection" echocheck "restrict keyword" for restrict_keyword in restrict __restrict __restrict__ ; do - echo "void foo(char * $restrict_keyword p); int main(void) {}" > $TMPC + echo "void foo(char * $restrict_keyword p); int main(void) { return 0; }" > $TMPC if cc_check; then _def_restrict_keyword=$restrict_keyword break; @@ -3125,6 +3125,7 @@ int main(void) { if (iconv_close(icdsc) == -1) ; } + return 0; } EOF _iconv=no @@ -3531,6 +3532,7 @@ int main(void) { EnterMovies(); ExitMovies(); CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0, false); + return 0; } EOF if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then @@ -3555,7 +3557,7 @@ EOF cat > $TMPC < #include -int main(void) {} +int main(void) { return 0; } EOF if cc_check -framework Carbon -framework QuartzCore -framework OpenGL; then _vosrc="$_vosrc vo_macosx.m" @@ -3747,6 +3749,7 @@ struct vis_identifier ident; struct fbgattr attr; ioctl(0, VIS_GETIDENTIFIER, &ident); ioctl(0, FBIOGATTR, &attr); +return 0; } EOF _xvr100=no @@ -3959,13 +3962,13 @@ if test "$_x11" = yes ; then #include #include #include -int main(void) { (void) DPMSQueryExtension(0, 0, 0); } +int main(void) { (void) DPMSQueryExtension(0, 0, 0); return 0; } EOF cc_check -lXdpms && _xdpms3=yes cat > $TMPC < #include -int main(void) { (void) DPMSQueryExtension(0, 0, 0); } +int main(void) { (void) DPMSQueryExtension(0, 0, 0); return 0; } EOF cc_check -lXext && _xdpms4=yes fi @@ -5883,7 +5886,7 @@ if test "$_speex" = auto ; then _speex=no cat > $TMPC << EOF #include -int main(void) { SpeexBits bits; void *dec; speex_decode_int(dec, &bits, dec); } +int main(void) { SpeexBits bits; void *dec; speex_decode_int(dec, &bits, dec); return 0; } EOF cc_check -lspeex $_ld_lm && _speex=yes fi @@ -6029,6 +6032,7 @@ int main(void) { mpc_decoder decoder; mpc_decoder_set_streaminfo(&decoder, &info); mpc_decoder_decode_frame(&decoder, NULL, 0, NULL); + return 0; } EOF cc_check -lmpcdec $_ld_lm && _musepack=yes @@ -6286,7 +6290,7 @@ if test "$_live" = auto && test "$_network" = yes ; then #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600) #error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from #endif -int main(void) {} +int main(void) { return 0; } EOF _live=no @@ -7181,7 +7185,7 @@ if test "$_inet6" = auto ; then #else #include #endif -int main(void) { struct sockaddr_in6 six; socket(AF_INET6, SOCK_STREAM, AF_INET6); } +int main(void) { struct sockaddr_in6 six; socket(AF_INET6, SOCK_STREAM, AF_INET6); return 0; } EOF _inet6=no if cc_check $_ld_sock ; then @@ -7202,7 +7206,7 @@ cat > $TMPC << EOF #include #include #include -int main(void) { gethostbyname2("", AF_INET); } +int main(void) { gethostbyname2("", AF_INET); return 0; } EOF _gethostbyname2=no if cc_check ; then -- cgit v1.2.3 From ff641a64292d4a5b7090e68bfb315f92065e13fb Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 15 Jul 2008 09:07:31 +0000 Subject: Add two more missing headers to configure checks. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27285 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index cec15b3d26..01774c5443 100755 --- a/configure +++ b/configure @@ -5687,6 +5687,7 @@ echores "$_fribidi" echocheck "ENCA" if test "$_enca" = auto ; then cat > $TMPC << EOF +#include #include int main(void) { const char **langs; @@ -6026,6 +6027,7 @@ echocheck "libmpcdec (musepack, version >= 1.2.1 required)" if test "$_musepack" = auto ; then _musepack=no cat > $TMPC << EOF +#include #include int main(void) { mpc_streaminfo info; -- cgit v1.2.3 From 64944f9385cfd08d8ae0d3f238881a5224d181ef Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 15 Jul 2008 09:17:07 +0000 Subject: Fix tgetent call in termcap configure test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27286 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 01774c5443..11c0f03667 100755 --- a/configure +++ b/configure @@ -3285,8 +3285,9 @@ fi #if sunos echocheck "termcap" if test "$_termcap" = auto ; then cat > $TMPC < #include -int main(void) { tgetent(); return 0; } +int main(void) { tgetent(NULL, NULL); return 0; } EOF _termcap=no for _ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do -- cgit v1.2.3 From 727a1272bcd105ff2ea35977b8e96c3cc615a6d1 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 15 Jul 2008 09:21:53 +0000 Subject: Fix dlopen(), dlclose() dlsym() calls in configure test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27287 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 11c0f03667..59018ba294 100755 --- a/configure +++ b/configure @@ -3016,8 +3016,9 @@ fi echocheck "dynamic loader" cat > $TMPC << EOF +#include #include -int main(void) { dlopen(0, 0); dlclose(0); dlsym(0, 0); return 0; } +int main(void) { dlopen(NULL, 0); dlclose(NULL); dlsym(NULL, NULL); return 0; } EOF _dl=no for _ld_tmp in "" "-ldl" ; do -- cgit v1.2.3 From b945a124efda487996d846324f94f05b15e0d160 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 15 Jul 2008 16:39:26 +0000 Subject: ALSA stupidly tries to define struct timeval and struct timespec, which may cause compilation errors. Check for this and disable ALSA. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27288 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configure b/configure index 59018ba294..373064b4b2 100755 --- a/configure +++ b/configure @@ -5197,6 +5197,7 @@ echocheck "ALSA audio" if test "$_alsa" != no ; then _alsa=no cat > $TMPC << EOF +#include #include #if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 5)) #error "alsa version != 0.5.x" @@ -5206,6 +5207,7 @@ EOF cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.5.x' cat > $TMPC << EOF +#include #include #if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)) #error "alsa version != 0.9.x" @@ -5214,6 +5216,7 @@ int main(void) { return 0; } EOF cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-sys' cat > $TMPC << EOF +#include #include #if !((SND_LIB_MAJOR == 0) && (SND_LIB_MINOR == 9)) #error "alsa version != 0.9.x" @@ -5223,6 +5226,7 @@ EOF cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='0.9.x-alsa' cat > $TMPC << EOF +#include #include #if !((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)) #error "alsa version != 1.0.x" @@ -5231,6 +5235,7 @@ int main(void) { return 0; } EOF cc_check -lasound $_ld_dl $_ld_pthread && _alsaver='1.0.x-sys' cat > $TMPC << EOF +#include #include #if !((SND_LIB_MAJOR == 1) && (SND_LIB_MINOR == 0)) #error "alsa version != 1.0.x" -- cgit v1.2.3 From 803385a5d71aec6a44afc9a6b9409eb5ed48722d Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 15 Jul 2008 17:35:52 +0000 Subject: Replace S_IREAD|S_IWRITE by POSIX-compatible S_IRUSR|S_IWUSR (not exactly the same, but should not matter). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27289 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_cddb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stream/stream_cddb.c b/stream/stream_cddb.c index 2f177eb7bd..ff12d94c17 100644 --- a/stream/stream_cddb.c +++ b/stream/stream_cddb.c @@ -390,7 +390,7 @@ cddb_write_cache(cddb_data_t *cddb_data) { sprintf( file_name, "%s%08lx", cddb_data->cache_dir, cddb_data->disc_id ); - file_fd = creat(file_name, S_IREAD|S_IWRITE); + file_fd = creat(file_name, S_IRUSR|S_IWUSR); if( file_fd<0 ) { perror("create"); return -1; -- cgit v1.2.3 From 7c78c34ace312ee47065d4517a7c775eea4c3d07 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 15 Jul 2008 19:05:42 +0000 Subject: Add const to libaf/filter.c functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27290 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/filter.c | 20 ++++++++++---------- libaf/filter.h | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libaf/filter.c b/libaf/filter.c index a6436b4108..fb5d93b7d5 100644 --- a/libaf/filter.c +++ b/libaf/filter.c @@ -25,8 +25,8 @@ w filter taps x input signal must be a circular buffer which is indexed backwards */ -inline FLOAT_TYPE af_filter_fir(register unsigned int n, FLOAT_TYPE* w, - FLOAT_TYPE* x) +inline FLOAT_TYPE af_filter_fir(register unsigned int n, const FLOAT_TYPE* w, + const FLOAT_TYPE* x) { register FLOAT_TYPE y; // Output y = 0.0; @@ -48,11 +48,11 @@ inline FLOAT_TYPE af_filter_fir(register unsigned int n, FLOAT_TYPE* w, s output buffer stride */ FLOAT_TYPE* af_filter_pfir(unsigned int n, unsigned int d, unsigned int xi, - FLOAT_TYPE** w, FLOAT_TYPE** x, FLOAT_TYPE* y, + const FLOAT_TYPE** w, const FLOAT_TYPE** x, FLOAT_TYPE* y, unsigned int s) { - register FLOAT_TYPE* xt = *x + xi; - register FLOAT_TYPE* wt = *w; + register const FLOAT_TYPE* xt = *x + xi; + register const FLOAT_TYPE* wt = *w; register int nt = 2*n; while(d-- > 0){ *y = af_filter_fir(n,wt,xt); @@ -69,7 +69,7 @@ FLOAT_TYPE* af_filter_pfir(unsigned int n, unsigned int d, unsigned int xi, filter. xq must be n*2 by k big, s is the index for in. */ int af_filter_updatepq(unsigned int n, unsigned int d, unsigned int xi, - FLOAT_TYPE** xq, FLOAT_TYPE* in, unsigned int s) + FLOAT_TYPE** xq, const FLOAT_TYPE* in, unsigned int s) { register FLOAT_TYPE* txq = *xq + xi; register int nt = n*2; @@ -99,7 +99,7 @@ int af_filter_updatepq(unsigned int n, unsigned int d, unsigned int xi, returns 0 if OK, -1 if fail */ -int af_filter_design_fir(unsigned int n, FLOAT_TYPE* w, FLOAT_TYPE* fc, +int af_filter_design_fir(unsigned int n, FLOAT_TYPE* w, const FLOAT_TYPE* fc, unsigned int flags, FLOAT_TYPE opt) { unsigned int o = n & 1; // Indicator for odd filter length @@ -238,7 +238,7 @@ int af_filter_design_fir(unsigned int n, FLOAT_TYPE* w, FLOAT_TYPE* fc, returns 0 if OK, -1 if fail */ -int af_filter_design_pfir(unsigned int n, unsigned int k, FLOAT_TYPE* w, +int af_filter_design_pfir(unsigned int n, unsigned int k, const FLOAT_TYPE* w, FLOAT_TYPE** pw, FLOAT_TYPE g, unsigned int flags) { int l = (int)n/k; // Length of individual FIR filters @@ -316,7 +316,7 @@ static void af_filter_prewarp(FLOAT_TYPE* a, FLOAT_TYPE fc, FLOAT_TYPE fs) Return: On return, set coef z-domain coefficients and k to the gain required to maintain overall gain = 1.0; */ -static void af_filter_bilinear(FLOAT_TYPE* a, FLOAT_TYPE* b, FLOAT_TYPE* k, +static void af_filter_bilinear(const FLOAT_TYPE* a, const FLOAT_TYPE* b, FLOAT_TYPE* k, FLOAT_TYPE fs, FLOAT_TYPE *coef) { FLOAT_TYPE ad, bd; @@ -417,7 +417,7 @@ static void af_filter_bilinear(FLOAT_TYPE* a, FLOAT_TYPE* b, FLOAT_TYPE* k, return -1 if fail 0 if success. */ -int af_filter_szxform(FLOAT_TYPE* a, FLOAT_TYPE* b, FLOAT_TYPE Q, FLOAT_TYPE fc, +int af_filter_szxform(const FLOAT_TYPE* a, const FLOAT_TYPE* b, FLOAT_TYPE Q, FLOAT_TYPE fc, FLOAT_TYPE fs, FLOAT_TYPE *k, FLOAT_TYPE *coef) { FLOAT_TYPE at[3]; diff --git a/libaf/filter.h b/libaf/filter.h index 089f707d3b..0993f86cce 100644 --- a/libaf/filter.h +++ b/libaf/filter.h @@ -44,26 +44,26 @@ #define ODD 0x00000010 // Make filter HP // Exported functions -extern FLOAT_TYPE af_filter_fir(unsigned int n, FLOAT_TYPE* w, FLOAT_TYPE* x); +extern FLOAT_TYPE af_filter_fir(unsigned int n, const FLOAT_TYPE* w, const FLOAT_TYPE* x); extern FLOAT_TYPE* af_filter_pfir(unsigned int n, unsigned int k, - unsigned int xi, FLOAT_TYPE** w, - FLOAT_TYPE** x, FLOAT_TYPE* y, + unsigned int xi, const FLOAT_TYPE** w, + const FLOAT_TYPE** x, FLOAT_TYPE* y, unsigned int s); //extern int af_filter_updateq(unsigned int n, unsigned int xi, // FLOAT_TYPE* xq, FLOAT_TYPE* in); extern int af_filter_updatepq(unsigned int n, unsigned int k, unsigned int xi, - FLOAT_TYPE** xq, FLOAT_TYPE* in, unsigned int s); + FLOAT_TYPE** xq, const FLOAT_TYPE* in, unsigned int s); -extern int af_filter_design_fir(unsigned int n, FLOAT_TYPE* w, FLOAT_TYPE* fc, +extern int af_filter_design_fir(unsigned int n, FLOAT_TYPE* w, const FLOAT_TYPE* fc, unsigned int flags, FLOAT_TYPE opt); -extern int af_filter_design_pfir(unsigned int n, unsigned int k, FLOAT_TYPE* w, +extern int af_filter_design_pfir(unsigned int n, unsigned int k, const FLOAT_TYPE* w, FLOAT_TYPE** pw, FLOAT_TYPE g, unsigned int flags); -extern int af_filter_szxform(FLOAT_TYPE* a, FLOAT_TYPE* b, FLOAT_TYPE Q, +extern int af_filter_szxform(const FLOAT_TYPE* a, const FLOAT_TYPE* b, FLOAT_TYPE Q, FLOAT_TYPE fc, FLOAT_TYPE fs, FLOAT_TYPE *k, FLOAT_TYPE *coef); -- cgit v1.2.3 From 24b14f84806ce2f9e2d7a8aafa946db059bfeab1 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 15 Jul 2008 19:08:09 +0000 Subject: Make af_hrtf tables static const git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27291 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libaf/af_hrtf.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libaf/af_hrtf.h b/libaf/af_hrtf.h index 1a5c73e579..0ddc5b343e 100644 --- a/libaf/af_hrtf.h +++ b/libaf/af_hrtf.h @@ -88,7 +88,7 @@ How to generate these data: /* Center front (-5 degree) - not 0 degree in order to create a clear front image from a finite distance */ -float cf_filt[128] = { +static const float cf_filt[128] = { -0.00008638082319075036, 0.0003198059946385229, -0.0005010631339162132, 0.0011424741331126876, -0.001584220794688753, 0.001742715363246275, @@ -155,7 +155,7 @@ float cf_filt[128] = { -0.005469203016468759, -0.004355784273189485 }; /* Front, same side (30 degree) */ -float af_filt[128] = { +static const float af_filt[128] = { -0.004140580614755493, 0.005790934614385445, 0.003318916682081112, 0.014257145544366063, 0.007328442487127339, -0.06550381777876194, @@ -222,7 +222,7 @@ float af_filt[128] = { -0.0005083025643192044, 0.00035096963769606926 }; /* Front, opposite (-30 degree) */ -float of_filt[128] = { +static const float of_filt[128] = { -0.000013472538374193126, -0.00008048061877079751, 0.000043927265781258155, -0.000017931700794858892, -0.000034774602476112886, -0.00009576223008735474, @@ -289,7 +289,7 @@ float of_filt[128] = { -0.0013726264946164232, -0.0020075119315034313 }; /* Rear, same side (135 degree) */ -float ar_filt[128] = { +static const float ar_filt[128] = { 0.004573315040810066, 0.0013592578059426913, 0.01553271930902704, -0.0002356117224941317, -0.05746098219774702, 0.03430688963370445, @@ -356,7 +356,7 @@ float ar_filt[128] = { -0.0026884314856593368, -0.004084181815125924 }; /* Rear, opposite (-135 degree) */ -float or_filt[128] = { +static const float or_filt[128] = { 0.0001220944028243897, -0.000021785381808441314, 5.823057988603169e-6, -0.00001217768176447613, -0.00006123604397345513, 5.574117262531134e-6, @@ -423,7 +423,7 @@ float or_filt[128] = { -0.001852908777923165, -0.002540339553144362 }; /* Center rear (180 degree) */ -float cr_filt[128] = { +static const float cr_filt[128] = { -0.00005989110716536726, -0.00022790291829128702, 0.0002659166098971966, -0.0003774772716776257, 0.0004540309551867803, -0.000420238187386368, -- cgit v1.2.3 From 011a23170695e8d1dca2ba66de8a38b133f25f42 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 15 Jul 2008 22:22:25 +0000 Subject: Add IDs to some XML elements to avoid warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27292 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/es/install.xml | 6 +++--- DOCS/xml/es/mencoder.xml | 6 +++--- DOCS/xml/es/usage.xml | 2 +- DOCS/xml/es/video.xml | 2 +- DOCS/xml/pl/mencoder.xml | 2 +- DOCS/xml/zh_CN/mencoder.xml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/DOCS/xml/es/install.xml b/DOCS/xml/es/install.xml index 5910a40471..3fd7e3ffcd 100644 --- a/DOCS/xml/es/install.xml +++ b/DOCS/xml/es/install.xml @@ -106,7 +106,7 @@ núcleo 2.4.x es recomendado. - + Codecs @@ -415,7 +415,7 @@ funciona con los siguientes controladores: - + Características @@ -778,7 +778,7 @@ Hay muchas maneras de conseguirlo: konwert o iconv. - +
Algunas URLs diff --git a/DOCS/xml/es/mencoder.xml b/DOCS/xml/es/mencoder.xml index 8ed11ab7a7..05c9452923 100644 --- a/DOCS/xml/es/mencoder.xml +++ b/DOCS/xml/es/mencoder.xml @@ -90,7 +90,7 @@ se inserta en el archivo de destino... y ¡ya está todo hecho! - + Ejemplo de codificación en 3-pasadas rm frameno.avi @@ -448,7 +448,7 @@ archivos .idx y .sub ya existen. Debería borrarlos antes de comenzar. - + Copiando dos subtítulos desde un DVD mientras se hace la codificación en 3-pasadas @@ -459,7 +459,7 @@ mencoder dvd://1 -oac copy -ovc divx4 -pass 2 -vobsubout subtitles -vobsuboutind --> - + Copiando un subtítulo francés desde un archivo MPEG rm subtitles.idx subtitles.sub diff --git a/DOCS/xml/es/usage.xml b/DOCS/xml/es/usage.xml index 9f8b2b7995..7f417086bf 100644 --- a/DOCS/xml/es/usage.xml +++ b/DOCS/xml/es/usage.xml @@ -123,7 +123,7 @@ usando la opción (ruta relativa a $HOME/.mplayer). - + Un archivo de control simple ## diff --git a/DOCS/xml/es/video.xml b/DOCS/xml/es/video.xml index abe41e90dc..382da89776 100644 --- a/DOCS/xml/es/video.xml +++ b/DOCS/xml/es/video.xml @@ -668,7 +668,7 @@ en la (si está presente) banda negra. -
+
Teclas solo para SDL diff --git a/DOCS/xml/pl/mencoder.xml b/DOCS/xml/pl/mencoder.xml index b4dd9aaeb9..c2e91525dc 100644 --- a/DOCS/xml/pl/mencoder.xml +++ b/DOCS/xml/pl/mencoder.xml @@ -241,7 +241,7 @@ może zostać prawidłowo odtworzony przez odtwarzacze inne niż MPlayer. - + kodowanie do formatu Macromedia Flash Tworzenie zbioru Macromedia Flash video, nadającego się do odtwarzania diff --git a/DOCS/xml/zh_CN/mencoder.xml b/DOCS/xml/zh_CN/mencoder.xml index bc443a55f8..f5d83f4122 100644 --- a/DOCS/xml/zh_CN/mencoder.xml +++ b/DOCS/xml/zh_CN/mencoder.xml @@ -235,7 +235,7 @@ AVI容器是MEncoder的基本容器格式，也就是 MPlayer之外的播放器中播放。 - + 编码为Macromedia Flash格式 生成Macromedia Flash视频，以便在安装有Macromedia Flash插件的网页浏览器中播放： -- cgit v1.2.3 From 4b068f19a9685e78dbcaf9dd747ffe0e0620501f Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 16 Jul 2008 15:08:34 +0000 Subject: Merge two consecutive sed calls into one. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27293 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 373064b4b2..77aea84947 100755 --- a/configure +++ b/configure @@ -191,7 +191,7 @@ case `echo -n` in *) _echo_n='-n ' _echo_c= ;; # BSD echo esac -LANGUAGES=`echo help/help_mp-??.h help/help_mp-??_??.h | sed "s:help/help_mp-\(..\).h:\1:g" | sed "s:help/help_mp-\(.....\).h:\1:g"` +LANGUAGES=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` show_help(){ cat << EOF -- cgit v1.2.3 From 4d16c72fa0f9cad215b44092769561cf265ee8d9 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 16 Jul 2008 15:09:24 +0000 Subject: Replace simple sed invocation by even simpler tr invocation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27294 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 77aea84947..f9c75a51f0 100755 --- a/configure +++ b/configure @@ -2601,7 +2601,7 @@ echores "$_langinfo" echocheck "language" test -z "$_language" && _language=$LINGUAS -_language=`echo $_language | sed 's/,/ /g'` +_language=`echo $_language | tr , " "` echo $_language | grep all > /dev/null || LANGUAGES="$_language en" for lang in $_language ; do test "$lang" = all && lang=en -- cgit v1.2.3 From fb01819aba80bee6b5b911373cb35909fe05ff50 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 16 Jul 2008 15:38:06 +0000 Subject: Replace output redirection with grep by POSIX standard options. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27295 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index f9c75a51f0..b21deb5835 100755 --- a/configure +++ b/configure @@ -2602,7 +2602,7 @@ echores "$_langinfo" echocheck "language" test -z "$_language" && _language=$LINGUAS _language=`echo $_language | tr , " "` -echo $_language | grep all > /dev/null || LANGUAGES="$_language en" +echo $_language | grep -q all || LANGUAGES="$_language en" for lang in $_language ; do test "$lang" = all && lang=en if test -f "help/help_mp-${lang}.h" ; then @@ -6670,7 +6670,7 @@ echocheck "zr" if test "$_zr" = auto ; then #36067's seem to identify themselves as 36057PQC's, so the line #below should work for 36067's and 36057's. - if grep -e "Multimedia video controller: Zoran Corporation ZR36057" /proc/pci > /dev/null 2>&1; then + if grep -q -s -e "Multimedia video controller: Zoran Corporation ZR36057" /proc/pci ; then _zr=yes else _zr=no @@ -7125,7 +7125,7 @@ short ascii_name[] = { (('M'<<8)|'P'),(('l'<<8)|'a'),(('y'<<8)|'e'),(('r'<<8)|'B int main(void) { return (int)ascii_name; } EOF if cc_check ; then - if strings $TMPEXE | grep -l MPlayerBigEndian >/dev/null ; then + if strings $TMPEXE | grep -q -l MPlayerBigEndian ; then _big_endian=yes else _big_endian=no @@ -7238,7 +7238,7 @@ if test "$_gui" = yes ; then # Required libraries if test "$_libavcodec" != yes || - ! echo $_libavdecoders | grep PNG_DECODER >/dev/null 2>&1 ; then + ! echo $_libavdecoders | grep -q PNG_DECODER ; then die "The GUI requires libavcodec with PNG support (needs zlib)." fi test "$_freetype" = no && test "$_bitmap_font" = no && \ @@ -7842,7 +7842,7 @@ ff_config_enable () { _nprefix=$3; test -z "$_nprefix" && _nprefix='CONFIG' for part in $1; do - if ` echo $2 | grep -E "(^| )$part($| )" > /dev/null `; then + if ` echo $2 | grep -q -E "(^| )$part($| )" `; then echo "#define ${_nprefix}_$part 1" echo "#define ENABLE_$part 1" else -- cgit v1.2.3 From e0a81e9d31bd71314560648c7433a44f7d8174d3 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 16 Jul 2008 15:51:15 +0000 Subject: cosmetics: Rename LANGUAGES variable to msg_langs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27296 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index b21deb5835..80a1bf748b 100755 --- a/configure +++ b/configure @@ -191,7 +191,7 @@ case `echo -n` in *) _echo_n='-n ' _echo_c= ;; # BSD echo esac -LANGUAGES=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` +msg_langs=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` show_help(){ cat << EOF @@ -417,7 +417,7 @@ Miscellaneous options: translated man pages, the first language is used for messages and the GUI (the environment variable \$LINGUAS is also honored) [en] - (Available: $LANGUAGES all) + (Available: $msg_langs all) --with-install=PATH path to a custom install program Advanced options: @@ -2602,7 +2602,7 @@ echores "$_langinfo" echocheck "language" test -z "$_language" && _language=$LINGUAS _language=`echo $_language | tr , " "` -echo $_language | grep -q all || LANGUAGES="$_language en" +echo $_language | grep -q all || msg_langs="$_language en" for lang in $_language ; do test "$lang" = all && lang=en if test -f "help/help_mp-${lang}.h" ; then @@ -2616,7 +2616,7 @@ done test -z "$_language" && _language=en _mp_help="help/help_mp-${_language}.h" test -f $_mp_help || die "$_mp_help not found" -for lang in $LANGUAGES ; do +for lang in $msg_langs ; do if test -f "DOCS/man/$lang/mplayer.1" ; then MAN_LANG_ALL="$lang $MAN_LANG_ALL" fi @@ -8607,7 +8607,7 @@ Config files successfully generated by ./configure $_configuration ! EOF echo ${_echo_n} " Manual pages: $MAN_LANG_ALL ${_echo_c}" -test "$LANGUAGES" = en && echo ${_echo_n} " (no localization selected, use --language=all)${_echo_c}" +test "$msg_langs" = en && echo ${_echo_n} " (no localization selected, use --language=all)${_echo_c}" echo cat << EOF -- cgit v1.2.3 From 5068f7a77886ef656c97dee800f666f615c66ebb Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 16 Jul 2008 15:53:21 +0000 Subject: Move the "all" option to the front of the list of available languages in the configure help output so it can be noticed more easily. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27297 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 80a1bf748b..25db924166 100755 --- a/configure +++ b/configure @@ -417,7 +417,7 @@ Miscellaneous options: translated man pages, the first language is used for messages and the GUI (the environment variable \$LINGUAS is also honored) [en] - (Available: $msg_langs all) + (Available: all $msg_langs) --with-install=PATH path to a custom install program Advanced options: -- cgit v1.2.3 From c2c1ef01893a860963f6d7d6a61b55fbffe3e108 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 16 Jul 2008 16:05:58 +0000 Subject: Remove redundant check in message language test. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27298 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 25db924166..b017d1ff80 100755 --- a/configure +++ b/configure @@ -2615,7 +2615,6 @@ for lang in $_language ; do done test -z "$_language" && _language=en _mp_help="help/help_mp-${_language}.h" -test -f $_mp_help || die "$_mp_help not found" for lang in $msg_langs ; do if test -f "DOCS/man/$lang/mplayer.1" ; then MAN_LANG_ALL="$lang $MAN_LANG_ALL" -- cgit v1.2.3 From 3f35a382375e2b0b10e3bb8757af8060da460278 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 16 Jul 2008 16:06:14 +0000 Subject: Do not just print a warning, also fix the len in ASF demuxer! git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27299 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_asf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 65741d3ab7..72a1d98e2e 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -488,6 +488,7 @@ static int demux_asf_fill_buffer(demuxer_t *demux, demux_stream_t *ds){ } if(len<0 || (p+len)>p_end){ mp_msg(MSGT_DEMUX,MSGL_V,"ASF_parser: warning! segment len=%d\n",len); + len = p_end - p; } mp_dbg(MSGT_DEMUX,MSGL_DBG4," seg #%d: streamno=%d seq=%d type=%02X len=%d\n",seg,streamno,seq,rlen,len); -- cgit v1.2.3 From fad0b588c2824b84449f04b9b69acb50742d3519 Mon Sep 17 00:00:00 2001 From: diego Date: Wed, 16 Jul 2008 16:14:56 +0000 Subject: Add variables for all available man page and documentation languages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27300 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configure b/configure index b017d1ff80..723da82009 100755 --- a/configure +++ b/configure @@ -192,6 +192,8 @@ case `echo -n` in esac msg_langs=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` +man_langs=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"` +doc_langs=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"` show_help(){ cat << EOF -- cgit v1.2.3 From e870f84bfba4ba9830c78f347e72805cd227d068 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 16 Jul 2008 16:18:25 +0000 Subject: 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 --- libmpdemux/demux_asf.c | 7 ------- libmpdemux/demux_real.c | 6 ------ libmpdemux/demux_viv.c | 6 ------ libmpdemux/demuxer.h | 8 +++++++- 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 -- cgit v1.2.3 From 4a46fcaebcf97243a5f7a24320e1871e57f2a948 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 16 Jul 2008 16:43:40 +0000 Subject: Make sure demuxed ASF packet is properly padded after descrambling git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27302 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_asf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index d007ae1a3e..8f370c6d31 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -50,9 +50,12 @@ static inline int check_varlen(uint8_t *ptr, uint8_t *endptr, int len) { } static void asf_descrambling(unsigned char **src,unsigned len, struct asf_priv* asf){ - unsigned char *dst=malloc(len); + unsigned char *dst; unsigned char *s2=*src; unsigned i=0,x,y; + if (len > UINT_MAX - FF_INPUT_BUFFER_PADDING_SIZE) + return; + dst = malloc(len + FF_INPUT_BUFFER_PADDING_SIZE); while(len>=asf->scrambling_h*asf->scrambling_w*asf->scrambling_b+i){ // mp_msg(MSGT_DEMUX,MSGL_DBG4,"descrambling! (w=%d b=%d)\n",w,asf_scrambling_b); //i+=asf_scrambling_h*asf_scrambling_w; -- cgit v1.2.3 From 2f5b26277f88b747584c017e696bad1eda50ef77 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 16 Jul 2008 17:28:19 +0000 Subject: 100l, fix calloc being called with the wrong argument due to reordering two lines in SVN r27263 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27303 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index b117a3f00d..613b4548b2 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -1887,7 +1887,7 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, "MOV: %*sEdit list table (%d entries) (ver:%d,flags:%d)\n", level, "", entries, ver, flags); #if 1 - trak->editlist = calloc(trak->editlist_size, sizeof(mov_editlist_t)); + trak->editlist = calloc(entries, sizeof(mov_editlist_t)); trak->editlist_size = trak->editlist ? entries : 0; for (i = 0; i < trak->editlist_size; i++) { int dur = stream_read_dword(demuxer->stream); -- cgit v1.2.3 From b422b105d7767fbb40aad7b81b34aa033a168057 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 16 Jul 2008 17:48:34 +0000 Subject: And a 1000l for r27263, swapped a condition, thus setting size to 0 when malloc succeeded instead of when it failed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27304 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_mov.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c index 613b4548b2..37de352510 100644 --- a/libmpdemux/demux_mov.c +++ b/libmpdemux/demux_mov.c @@ -1751,7 +1751,7 @@ static int lschunks_intrak(demuxer_t* demuxer, int level, unsigned int id, "MOV: %*sSample duration table! (%d blocks)\n", level, "", len); trak->durmap = calloc(len, sizeof(mov_durmap_t)); - trak->durmap_size = trak->durmap ? 0 : len; + trak->durmap_size = trak->durmap ? len : 0; for (i = 0; i < trak->durmap_size; i++) { trak->durmap[i].num = stream_read_dword(demuxer->stream); trak->durmap[i].dur = stream_read_dword(demuxer->stream); -- cgit v1.2.3 From 9254d010eaf72973716e3e254376172858b64db5 Mon Sep 17 00:00:00 2001 From: reimar Date: Wed, 16 Jul 2008 18:51:39 +0000 Subject: limits.h is required for UINT_MAX git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27305 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_asf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 8f370c6d31..3dc18d920c 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -3,6 +3,7 @@ #include #include #include +#include #include "config.h" #include "mp_msg.h" -- cgit v1.2.3 From a078ef894caac98ecbe680c6d9fc571c605ddd7c Mon Sep 17 00:00:00 2001 From: zuxy Date: Thu, 17 Jul 2008 10:07:21 +0000 Subject: Force gcc to emit function body under -gnu99 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27306 b3059339-0415-0410-9bf9-f77b7e298cf2 --- gui/win32/gui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/win32/gui.c b/gui/win32/gui.c index 1fd0fcd24a..56b4c0c37a 100644 --- a/gui/win32/gui.c +++ b/gui/win32/gui.c @@ -1069,7 +1069,7 @@ static LRESULT CALLBACK EventProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM return DefWindowProc(hWnd, message, wParam, lParam); } -inline void startplay(gui_t *gui) +__attribute__((gnu_inline)) inline void startplay(gui_t *gui) { handlemsg(gui->mainwindow, evDropFile); } -- cgit v1.2.3 From 33ff3271b163284a0c30b0d54c75ddbadda11be3 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 11:54:42 +0000 Subject: Evaluate man page installation rule for all available languages, but only install the requested languages. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27307 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 6beffe562e..f3b75830bb 100644 --- a/Makefile +++ b/Makefile @@ -819,8 +819,8 @@ install-dirs: install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -install-mplayer-man: $(foreach lang,$(MAN_LANG_ALL),install-mplayer-man-$(lang)) -install-mencoder-man: $(foreach lang,$(MAN_LANG_ALL),install-mencoder-man-$(lang)) +install-mplayer-man: $(foreach lang,$(MAN_LANG),install-mplayer-man-$(lang)) +install-mencoder-man: $(foreach lang,$(MAN_LANG),install-mencoder-man-$(lang)) install-mplayer-man-en: $(INSTALL) -d $(MANDIR)/man1 @@ -840,8 +840,8 @@ install-mencoder-man-$(lang): install-mplayer-man-$(lang) cd $(MANDIR)/$(lang)/man1 && ln -sf mplayer.1 mencoder.1 endef -$(foreach lang,$(MAN_LANG),$(eval $(MPLAYER_MAN_RULE))) -$(foreach lang,$(MAN_LANG),$(eval $(MENCODER_MAN_RULE))) +$(foreach lang,$(MAN_LANG_ALL),$(eval $(MPLAYER_MAN_RULE))) +$(foreach lang,$(MAN_LANG_ALL),$(eval $(MENCODER_MAN_RULE))) install-gui: install-mplayer -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) -- cgit v1.2.3 From 87f1f5fea3bbaec1825170337ecf018ef525af19 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 12:19:39 +0000 Subject: cosmetics: Rename _doc_lang variable to doc_lang. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27308 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 723da82009..eb8889901b 100755 --- a/configure +++ b/configure @@ -2623,8 +2623,8 @@ for lang in $msg_langs ; do fi done MAN_LANG="$(echo $MAN_LANG_ALL | sed 's/en//')" -_doc_lang=$_language -test -d DOCS/xml/$_doc_lang || _doc_lang=en +doc_lang=$_language +test -d DOCS/xml/$doc_lang || doc_lang=en echores "using $_language (man pages: $MAN_LANG_ALL)" @@ -8635,7 +8635,7 @@ EOF if test "$_mtrr" = yes ; then - echo "Please check mtrr settings at /proc/mtrr (see DOCS/HTML/$_doc_lang/video.html#mtrr)" + echo "Please check mtrr settings at /proc/mtrr (see DOCS/HTML/$doc_lang/video.html#mtrr)" echo fi @@ -8662,7 +8662,7 @@ If you used one of these options (except --enable-gui and similar ones that turn on internal features) and experience a compilation or linking failure, make sure you have passed the necessary compiler/linker flags to configure. -If you suspect a bug, please read DOCS/HTML/$_doc_lang/bugreports.html. +If you suspect a bug, please read DOCS/HTML/$doc_lang/bugreports.html. EOF -- cgit v1.2.3 From 535174672b28ee5a23dbeb530ea909ee346bdb11 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 12:22:05 +0000 Subject: Remove note about localization from configure output. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27309 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index eb8889901b..d6746afd8f 100755 --- a/configure +++ b/configure @@ -8608,7 +8608,6 @@ Config files successfully generated by ./configure $_configuration ! EOF echo ${_echo_n} " Manual pages: $MAN_LANG_ALL ${_echo_c}" -test "$msg_langs" = en && echo ${_echo_n} " (no localization selected, use --language=all)${_echo_c}" echo cat << EOF -- cgit v1.2.3 From 67dec9f5a82ac4a2e3d6adf92c9450c58688179a Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 12:24:47 +0000 Subject: Simplify summary output, add an extra empty line to it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27310 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/configure b/configure index d6746afd8f..57911b98be 100755 --- a/configure +++ b/configure @@ -8605,18 +8605,14 @@ Config files successfully generated by ./configure $_configuration ! Languages: Messages/GUI: $_language -EOF - -echo ${_echo_n} " Manual pages: $MAN_LANG_ALL ${_echo_c}" -echo - -cat << EOF + Manual pages: $MAN_LANG_ALL Enabled optional drivers: Input: $_inputmodules Codecs: $_codecmodules Audio output: $_aomodules Video output: $_vomodules + Disabled optional drivers: Input: $_noinputmodules Codecs: $_nocodecmodules -- cgit v1.2.3 From adc68058bd8f88d6a9c59493468f734fdf3af895 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 12:36:54 +0000 Subject: Rewrite translation handling in the build system. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27311 b3059339-0415-0410-9bf9-f77b7e298cf2 --- Makefile | 6 +++--- configure | 55 +++++++++++++++++++++++++++++++++---------------------- 2 files changed, 36 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index f3b75830bb..94afe8de74 100644 --- a/Makefile +++ b/Makefile @@ -819,8 +819,8 @@ install-dirs: install-%: %$(EXESUF) install-dirs $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) -install-mplayer-man: $(foreach lang,$(MAN_LANG),install-mplayer-man-$(lang)) -install-mencoder-man: $(foreach lang,$(MAN_LANG),install-mencoder-man-$(lang)) +install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) +install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang)) install-mplayer-man-en: $(INSTALL) -d $(MANDIR)/man1 @@ -856,7 +856,7 @@ uninstall: rm -f $(prefix)/share/pixmaps/mplayer.xpm rm -f $(prefix)/share/applications/mplayer.desktop rm -f $(MANDIR)/man1/mplayer.1 $(MANDIR)/man1/mencoder.1 - rm -f $(foreach lang,$(MAN_LANG),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) + rm -f $(foreach lang,$(MAN_LANGS),$(foreach man,mplayer.1 mencoder.1,$(MANDIR)/$(lang)/man1/$(man))) clean: rm -f $(foreach dir,$(DIRS),$(foreach suffix,/*.o /*.a /*.ho /*~, $(addsuffix $(suffix),$(dir)))) diff --git a/configure b/configure index 57911b98be..e20345491a 100755 --- a/configure +++ b/configure @@ -191,9 +191,9 @@ case `echo -n` in *) _echo_n='-n ' _echo_c= ;; # BSD echo esac -msg_langs=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` -man_langs=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"` -doc_langs=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"` +msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` +man_lang_all=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"` +doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"` show_help(){ cat << EOF @@ -419,7 +419,7 @@ Miscellaneous options: translated man pages, the first language is used for messages and the GUI (the environment variable \$LINGUAS is also honored) [en] - (Available: all $msg_langs) + (Available: all $msg_lang_all) --with-install=PATH path to a custom install program Advanced options: @@ -2604,28 +2604,38 @@ echores "$_langinfo" echocheck "language" test -z "$_language" && _language=$LINGUAS _language=`echo $_language | tr , " "` -echo $_language | grep -q all || msg_langs="$_language en" +if $(echo $_language | grep -q all) ; then + doc_lang=en ; doc_langs=$doc_lang_all + man_lang=en ; man_langs=$man_lang_all + msg_lang=en +else + for lang in $_language ; do + if test -d DOCS/man/$lang ; then + tmp_man_langs="$tmp_man_langs $lang" + fi + if test -d DOCS/xml/$lang ; then + tmp_doc_langs="$tmp_doc_langs $lang" + fi + done + man_langs=$tmp_man_langs + doc_langs=$tmp_man_langs for lang in $_language ; do - test "$lang" = all && lang=en if test -f "help/help_mp-${lang}.h" ; then - _language=$lang + msg_lang=$lang break else echo ${_echo_n} "$lang not found, ${_echo_c}" _language=`echo $_language | sed "s/$lang *//"` fi done -test -z "$_language" && _language=en -_mp_help="help/help_mp-${_language}.h" -for lang in $msg_langs ; do - if test -f "DOCS/man/$lang/mplayer.1" ; then - MAN_LANG_ALL="$lang $MAN_LANG_ALL" - fi -done -MAN_LANG="$(echo $MAN_LANG_ALL | sed 's/en//')" -doc_lang=$_language -test -d DOCS/xml/$doc_lang || doc_lang=en -echores "using $_language (man pages: $MAN_LANG_ALL)" +fi +test -z "$doc_langs" && doc_langs=en +test -z "$man_langs" && man_langs=en +test -z "$doc_lang" && doc_lang=$(echo $doc_langs | cut -f1 -d" ") +test -z "$man_lang" && man_lang=$(echo $man_langs | cut -f1 -d" ") +test -z "$msg_lang" && msg_lang=en +_mp_help="help/help_mp-${_msg_lang}.h" +echores "messages: $msg_lang - man pages: $man_langs - documentation: $doc_langs" echocheck "enable sighandler" @@ -7609,8 +7619,9 @@ cat > config.mak << EOF # Ensure that locale settings do not interfere with shell commands. export LC_ALL = C -MAN_LANG = $MAN_LANG -MAN_LANG_ALL = $MAN_LANG_ALL +MAN_LANG = $man_lang +MAN_LANGS = $man_langs +MAN_LANG_ALL = $man_lang_all DESTDIR = prefix = \$(DESTDIR)$_prefix @@ -8604,8 +8615,8 @@ Config files successfully generated by ./configure $_configuration ! Optimizing for: $_optimizing Languages: - Messages/GUI: $_language - Manual pages: $MAN_LANG_ALL + Messages/GUI: $msg_lang + Manual pages: $man_langs Enabled optional drivers: Input: $_inputmodules -- cgit v1.2.3 From 4cbefcd4f1acbfb5e3c24a2b4dbd472526a322cc Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 12:38:05 +0000 Subject: cosmetics: Indent language handling after last commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27312 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/configure b/configure index e20345491a..b364520a91 100755 --- a/configure +++ b/configure @@ -2619,15 +2619,15 @@ else done man_langs=$tmp_man_langs doc_langs=$tmp_man_langs -for lang in $_language ; do - if test -f "help/help_mp-${lang}.h" ; then - msg_lang=$lang - break - else - echo ${_echo_n} "$lang not found, ${_echo_c}" - _language=`echo $_language | sed "s/$lang *//"` - fi -done + for lang in $_language ; do + if test -f "help/help_mp-${lang}.h" ; then + msg_lang=$lang + break + else + echo ${_echo_n} "$lang not found, ${_echo_c}" + _language=`echo $_language | sed "s/$lang *//"` + fi + done fi test -z "$doc_langs" && doc_langs=en test -z "$man_langs" && man_langs=en -- cgit v1.2.3 From 6dfb85dc9ec79ec10e073e317566cfc0fbffb319 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 17 Jul 2008 17:11:30 +0000 Subject: Our ALSA code needs alloca, so check for it in configure and include alloca.h git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27313 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 4 ++++ libao2/ao_alsa.c | 1 + stream/ai_alsa.c | 1 + stream/ai_alsa1x.c | 1 + 4 files changed, 7 insertions(+) diff --git a/configure b/configure index b364520a91..d8c0817433 100755 --- a/configure +++ b/configure @@ -5205,6 +5205,10 @@ fi echores "$_openal" echocheck "ALSA audio" +if test "$_alloca" != yes ; then + _alsa=no + _res_comment="alloca missing" +fi if test "$_alsa" != no ; then _alsa=no cat > $TMPC << EOF diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index 0d925ce9e3..987713e6f9 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "config.h" #include "subopt-helper.h" diff --git a/stream/ai_alsa.c b/stream/ai_alsa.c index a1468bed09..84d0aa58a4 100644 --- a/stream/ai_alsa.c +++ b/stream/ai_alsa.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "config.h" diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c index 455c64191f..aab42e397b 100644 --- a/stream/ai_alsa1x.c +++ b/stream/ai_alsa1x.c @@ -1,6 +1,7 @@ #include #include #include +#include #include "config.h" -- cgit v1.2.3 From 4153f4e21c26703a6cc68ed33be9f90365788816 Mon Sep 17 00:00:00 2001 From: reimar Date: Thu, 17 Jul 2008 17:14:12 +0000 Subject: Avoid including avcodec.h in demuxer.h (and thus many other files) just to get FF_INPUT_BUFFER_PADDING_SIZE. Instead use MP_INPUT_BUFFER_PADDING_SIZE and add a preprocessor check that it is big enough. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27314 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_asf.c | 8 ++++---- libmpdemux/demux_real.c | 4 ++-- libmpdemux/demux_viv.c | 6 +++--- libmpdemux/demuxer.c | 7 +++++++ libmpdemux/demuxer.h | 8 ++------ libmpdemux/video.c | 16 ++++++++-------- 6 files changed, 26 insertions(+), 23 deletions(-) diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index 3dc18d920c..518d08d220 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -54,9 +54,9 @@ static void asf_descrambling(unsigned char **src,unsigned len, struct asf_priv* unsigned char *dst; unsigned char *s2=*src; unsigned i=0,x,y; - if (len > UINT_MAX - FF_INPUT_BUFFER_PADDING_SIZE) + if (len > UINT_MAX - MP_INPUT_BUFFER_PADDING_SIZE) return; - dst = malloc(len + FF_INPUT_BUFFER_PADDING_SIZE); + dst = malloc(len + MP_INPUT_BUFFER_PADDING_SIZE); while(len>=asf->scrambling_h*asf->scrambling_w*asf->scrambling_b+i){ // mp_msg(MSGT_DEMUX,MSGL_DBG4,"descrambling! (w=%d b=%d)\n",w,asf_scrambling_b); //i+=asf_scrambling_h*asf_scrambling_w; @@ -86,9 +86,9 @@ static void init_priv (struct asf_priv* asf){ 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); - dp->buffer=realloc(dp->buffer,dp->len+len+FF_INPUT_BUFFER_PADDING_SIZE); + dp->buffer=realloc(dp->buffer,dp->len+len+MP_INPUT_BUFFER_PADDING_SIZE); fast_memcpy(dp->buffer+dp->len,data,len); - memset(dp->buffer+dp->len+len, 0, FF_INPUT_BUFFER_PADDING_SIZE); + memset(dp->buffer+dp->len+len, 0, MP_INPUT_BUFFER_PADDING_SIZE); mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len); dp->len+=len; } diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 3490501302..7de8611ec0 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -934,8 +934,8 @@ got_video: // increase buffer size, this should not happen! mp_msg(MSGT_DEMUX,MSGL_WARN, "chunktab buffer too small!!!!!\n"); dp->len=dp_hdr->chunktab+8*(4+dp_hdr->chunks); - dp->buffer=realloc(dp->buffer,dp->len+FF_INPUT_BUFFER_PADDING_SIZE); - memset(dp->buffer + dp->len, 0, FF_INPUT_BUFFER_PADDING_SIZE); + dp->buffer=realloc(dp->buffer,dp->len+MP_INPUT_BUFFER_PADDING_SIZE); + memset(dp->buffer + dp->len, 0, MP_INPUT_BUFFER_PADDING_SIZE); // re-calc pointers: dp_hdr=(dp_hdr_t*)dp->buffer; dp_data=dp->buffer+sizeof(dp_hdr_t); diff --git a/libmpdemux/demux_viv.c b/libmpdemux/demux_viv.c index 7ee2332e27..489ccaaf19 100644 --- a/libmpdemux/demux_viv.c +++ b/libmpdemux/demux_viv.c @@ -378,10 +378,10 @@ static int demux_vivo_fill_buffer(demuxer_t *demux, demux_stream_t *dsds){ } else { // append data to it! demux_packet_t* dp=ds->asf_packet; - if(dp->len + len + FF_INPUT_BUFFER_PADDING_SIZE < 0) + if(dp->len + len + MP_INPUT_BUFFER_PADDING_SIZE < 0) return 0; - dp->buffer=realloc(dp->buffer,dp->len+len+FF_INPUT_BUFFER_PADDING_SIZE); - memset(dp->buffer+dp->len+len, 0, FF_INPUT_BUFFER_PADDING_SIZE); + dp->buffer=realloc(dp->buffer,dp->len+len+MP_INPUT_BUFFER_PADDING_SIZE); + memset(dp->buffer+dp->len+len, 0, MP_INPUT_BUFFER_PADDING_SIZE); //memcpy(dp->buffer+dp->len,data,len); stream_read(demux->stream,dp->buffer+dp->len,len); mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len); diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index afa9d4fdcc..6d51b434e8 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -27,6 +27,13 @@ #include "libass/ass_mp.h" #endif +#ifdef USE_LIBAVCODEC +#include "libavcodec/avcodec.h" +#if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE +#error MP_INPUT_BUFFER_PADDING_SIZE is too small! +#endif +#endif + extern void resync_video_stream(sh_video_t *sh_video); extern void resync_audio_stream(sh_audio_t *sh_audio); diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 76942a3aed..8cea2ace78 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -93,11 +93,7 @@ #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 +#define MP_INPUT_BUFFER_PADDING_SIZE 8 // Holds one packet/frame/whatever typedef struct demux_packet_st { @@ -249,7 +245,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 + FF_INPUT_BUFFER_PADDING_SIZE))) + if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + MP_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 cd061acc1c..95348a8efa 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -111,8 +111,8 @@ switch(video_codec){ } mp_msg(MSGT_DECVIDEO,MSGL_V,"OK!\n"); if(!videobuffer) { - videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); - if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, FF_INPUT_BUFFER_PADDING_SIZE); + videobuffer=(char*)memalign(8,VIDEOBUFFER_SIZE + MP_INPUT_BUFFER_PADDING_SIZE); + if (videobuffer) memset(videobuffer+VIDEOBUFFER_SIZE, 0, MP_INPUT_BUFFER_PADDING_SIZE); else { mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_ShMemAllocFail); return 0; @@ -204,8 +204,8 @@ switch(video_codec){ } mp