October 2024 - MPlayer-cvslog - lists.mplayerhq.hu

r38666 - trunk/configure
by komh 07 Oct '24

07 Oct '24

Author: komh Date: Mon Oct 7 15:24:56 2024 New Revision: 38666 Log: configure: remove -Zomf from flags when checking extern symbol prefix on OS/2 OS/2 nm does work only with aout format. If -Zomf is given, gcc generates OMF object file not aout object file. As a result, nm fails to detect extern symbol prefix. This allows users to pass -Zomf to configure via --extra-cflags and/or --extra-ldfalgs. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Oct 5 22:07:25 2024 (r38665) +++ trunk/configure Mon Oct 7 15:24:56 2024 (r38666) @@ -1699,6 +1699,15 @@ msvc_filter_flags() { done } +os2_aout_filter_flags() { + for f; do + case $f in + -Zomf) ;; + *) echo -n $f" " ;; + esac + done +} + AR_O='$@' CC_O='-o $@' CC_LINK_O='-o $@' @@ -2920,7 +2929,11 @@ echocheck "extern symbol prefix" cat > $TMPC << EOF int ff_extern; EOF +# OS/2 nm does work only with aout format. Remove -Zomf from flags. +os2 && + { saved_filter_flags=$filter_flags; filter_flags=os2_aout_filter_flags; } cc_check -c || die "Symbol mangling check failed." +os2 && filter_flags=$saved_filter_flags sym=$($_nm -P -g $TMPEXE | grep ff_extern) extern_prefix=${sym%%ff_extern*} def_extern_asm="#define EXTERN_ASM $extern_prefix"

1 0

r38665 - trunk/libmpcodecs/ve_nuv.c
by ib 05 Oct '24

05 Oct '24

Author: ib Date: Sat Oct 5 22:07:25 2024 New Revision: 38665 Log: Use correct type to define the variable passed to lzo1x_1_compress(). Recent compilers consider an implicit cast to be an error. Modified: trunk/libmpcodecs/ve_nuv.c Modified: trunk/libmpcodecs/ve_nuv.c ============================================================================== --- trunk/libmpcodecs/ve_nuv.c Tue Oct 1 15:43:31 2024 (r38664) +++ trunk/libmpcodecs/ve_nuv.c Sat Oct 5 22:07:25 2024 (r38665) @@ -125,7 +125,7 @@ static int put_image(struct vf_instance uint8_t* data = vf->priv->buffer + FRAMEHEADERSIZE; uint8_t* zdata = vf->priv->zbuffer + FRAMEHEADERSIZE; int len = 0, r; - size_t zlen = 0; + lzo_uint zlen = 0; memset(header, 0, FRAMEHEADERSIZE); // Reset the header if(vf->priv->lzo)

1 0

r38664 - trunk/asxparser.c
by ib 01 Oct '24

01 Oct '24

Author: ib Date: Tue Oct 1 15:43:31 2024 New Revision: 38664 Log: Check the return value of malloc() to avoid a NULL pointer dereference. This fixes https://bugs.debian.org/1083029 and closes Trac #2426. Modified: trunk/asxparser.c Modified: trunk/asxparser.c ============================================================================== --- trunk/asxparser.c Tue Oct 1 11:42:31 2024 (r38663) +++ trunk/asxparser.c Tue Oct 1 15:43:31 2024 (r38664) @@ -118,6 +118,7 @@ asx_parse_attribs(ASX_Parser_t* parser,c } } attrib = malloc(ptr2-ptr1+2); + if(!attrib) return -1; strncpy(attrib,ptr1,ptr2-ptr1+1); attrib[ptr2-ptr1+1] = '\0';

1 0

r38663 - trunk/configure
by komh 01 Oct '24

01 Oct '24

Author: komh Date: Tue Oct 1 11:42:31 2024 New Revision: 38663 Log: configure: define _EMX_SOURCE on OS/2 -std=c11 disables many extensions of OS/2 kLIBC. And this causes many compilation errors such as implicit functions. To enable extensions of OS/2 kLIBC, define _EMX_SOURCE. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Oct 1 11:05:38 2024 (r38662) +++ trunk/configure Tue Oct 1 11:42:31 2024 (r38663) @@ -1952,6 +1952,7 @@ if os2 ; then test -n "$ld_static" && ld_static='-Wl,-static' # OS/2 linker does not support a thin archive. Remove 'T' flag. _arflags=$(echo $_arflags | tr -d T) + extra_cflags="$extra_cflags -D_EMX_SOURCE" fi if wine ; then

1 0

r38662 - trunk/osdep/mmap.h
by komh 01 Oct '24

01 Oct '24

Author: komh Date: Tue Oct 1 11:05:38 2024 New Revision: 38662 Log: osdep/mmap.h: define MAP_FAILED if necessary If sys/mman.h defines MAP_FAILED, config.h will not define MAP_FAILED. In this case, MAP_FAILED is not defined at all and compilation errors occur. Modified: trunk/osdep/mmap.h Modified: trunk/osdep/mmap.h ============================================================================== --- trunk/osdep/mmap.h Tue Oct 1 10:59:39 2024 (r38661) +++ trunk/osdep/mmap.h Tue Oct 1 11:05:38 2024 (r38662) @@ -46,7 +46,9 @@ */ #define MAP_ANON 0x1000 /* allocated from memory, swap space */ -/* MAP_FAILED is defined in config.h */ +#ifndef MAP_FAILED +#define MAP_FAILED ((void *) -1) +#endif #ifndef _MMAP_DECLARED #define _MMAP_DECLARED

1 0

r38661 - in trunk/libao2: ao_dart.c ao_kai.c
by komh 01 Oct '24

01 Oct '24

Author: komh Date: Tue Oct 1 10:59:39 2024 New Revision: 38661 Log: ao_dart, ao_kai: fix compilation due to switch from AVFifoBuffer to AVFifo Based on the changes to ao_sdl, http://lists.mplayerhq.hu/pipermail/mplayer-cvslog/2024-April/047665.html Patch by Dave Yeo, dave.r.yeo gmail com Modified: trunk/libao2/ao_dart.c trunk/libao2/ao_kai.c Modified: trunk/libao2/ao_dart.c ============================================================================== --- trunk/libao2/ao_dart.c Sat Sep 21 12:30:18 2024 (r38660) +++ trunk/libao2/ao_dart.c Tue Oct 1 10:59:39 2024 (r38661) @@ -54,7 +54,7 @@ LIBAO_EXTERN(dart) #define CHUNK_SIZE ao_data.outburst -static AVFifoBuffer *m_audioBuf; +static AVFifo *m_audioBuf; static int m_nBufSize = 0; @@ -62,22 +62,23 @@ static volatile int m_fQuit = FALSE; static int write_buffer(unsigned char *data, int len) { - int nFree = av_fifo_space(m_audioBuf); + int nFree = av_fifo_can_write(m_audioBuf); if (len > nFree) len = nFree; - return av_fifo_generic_write(m_audioBuf, data, len, NULL); + av_fifo_write(m_audioBuf, data, len); + return len; } static int read_buffer(unsigned char *data, int len) { - int nBuffered = av_fifo_size(m_audioBuf); + int nBuffered = av_fifo_can_read(m_audioBuf); if (len > nBuffered) len = nBuffered; - av_fifo_generic_read(m_audioBuf, data, len, NULL); + av_fifo_read(m_audioBuf, data, len); return len; } @@ -199,7 +200,7 @@ static int init(int rate, int channels, // and one more chunk plus round up m_nBufSize += 2 * CHUNK_SIZE; - m_audioBuf = av_fifo_alloc(m_nBufSize); + m_audioBuf = av_fifo_alloc2(m_nBufSize, 1, 0); dartPlay(); @@ -223,7 +224,7 @@ static void uninit(int immed) dartClose(); - av_fifo_free(m_audioBuf); + av_fifo_freep2(&m_audioBuf); } // stop playing and empty buffers (for seeking/pause) @@ -232,7 +233,7 @@ static void reset(void) dartPause(); // Reset ring-buffer state - av_fifo_reset(m_audioBuf); + av_fifo_reset2(m_audioBuf); dartResume(); } @@ -252,7 +253,7 @@ static void audio_resume(void) // return: how many bytes can be played without blocking static int get_space(void) { - return av_fifo_space(m_audioBuf); + return av_fifo_can_write(m_audioBuf); } // plays 'len' bytes of 'data' @@ -270,7 +271,7 @@ static int play(void *data, int len, int // return: delay in seconds between first and last sample in buffer static float get_delay(void) { - int nBuffered = av_fifo_size(m_audioBuf); // could be less + int nBuffered = av_fifo_can_read(m_audioBuf); // could be less return (float)nBuffered / (float)ao_data.bps; } Modified: trunk/libao2/ao_kai.c ============================================================================== --- trunk/libao2/ao_kai.c Sat Sep 21 12:30:18 2024 (r38660) +++ trunk/libao2/ao_kai.c Tue Oct 1 10:59:39 2024 (r38661) @@ -55,7 +55,7 @@ LIBAO_EXTERN(kai) #define CHUNK_SIZE ao_data.outburst -static AVFifoBuffer *m_audioBuf; +static AVFifo *m_audioBuf; static int m_nBufSize = 0; @@ -67,20 +67,21 @@ static HKAI m_hkai; static int write_buffer(unsigned char *data, int len) { - int nFree = av_fifo_space(m_audioBuf); + int nFree = av_fifo_can_write(m_audioBuf); len = FFMIN(len, nFree); - return av_fifo_generic_write(m_audioBuf, data, len, NULL); + av_fifo_write(m_audioBuf, data, len); + return len; } static int read_buffer(unsigned char *data, int len) { - int nBuffered = av_fifo_size(m_audioBuf); + int nBuffered = av_fifo_can_read(m_audioBuf); len = FFMIN(len, nBuffered); - av_fifo_generic_read(m_audioBuf, data, len, NULL); + av_fifo_read(m_audioBuf, data, len); return len; } @@ -255,7 +256,7 @@ static int init(int rate, int channels, mp_msg(MSGT_AO, MSGL_V, "KAI: internal audio buffer size = %d bytes\n", m_nBufSize); - m_audioBuf = av_fifo_alloc(m_nBufSize); + m_audioBuf = av_fifo_alloc2(m_nBufSize, 1, 0); kaiPlay(m_hkai); @@ -280,7 +281,7 @@ static void uninit(int immed) kaiDone(); - av_fifo_free(m_audioBuf); + av_fifo_freep2(&m_audioBuf); } // stop playing and empty buffers (for seeking/pause) @@ -289,7 +290,7 @@ static void reset(void) kaiPause(m_hkai); // Reset ring-buffer state - av_fifo_reset(m_audioBuf); + av_fifo_reset2(m_audioBuf); kaiResume(m_hkai); } @@ -309,7 +310,7 @@ static void audio_resume(void) // return: how many bytes can be played without blocking static int get_space(void) { - return av_fifo_space(m_audioBuf); + return av_fifo_can_write(m_audioBuf); } // plays 'len' bytes of 'data' @@ -327,7 +328,7 @@ static int play(void *data, int len, int // return: delay in seconds between first and last sample in buffer static float get_delay(void) { - int nBuffered = av_fifo_size(m_audioBuf); // could be less + int nBuffered = av_fifo_can_read(m_audioBuf); // could be less return (float)nBuffered / (float)ao_data.bps; }

1 0