/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
#include <vlc/vlc.h>
#include <vlc_block.h>
{
sout_mux_t *p_mux = (sout_mux_t*)p_this;
sout_mux_sys_t *p_sys = p_mux->p_sys;
- int i;
+ unsigned int i;
if( av_write_trailer( p_sys->oc ) < 0 )
{
}
#else
# warning "WARNING!!!!!!!"
-# warning "Using libavformat muxing with versions older than 51.8.0 (r7593) might produce broken files.
+# warning "Using libavformat muxing with versions older than 51.8.0 (r7593) might produce broken files."
/* This is a hack */
if( i_codec_id == CODEC_ID_MP2 )
i_codec_id = CODEC_ID_MP3;
/* We don't really need to have anything in the SPU fifo */
if( p_mux->pp_inputs[i]->p_fmt->i_cat == SPU_ES &&
- p_fifo->i_depth == 0 ) continue;
+ block_FifoCount( p_fifo ) == 0 ) continue;
- if( p_fifo->i_depth )
+ if( block_FifoCount( p_fifo ) )
{
block_t *p_buf;
return VLC_SUCCESS;
case MUX_GET_MIME:
+ {
+ char **ppsz = (char**)va_arg( args, char ** );
+ *ppsz = strdup( p_mux->p_sys->oc->oformat->mime_type );
+ return VLC_SUCCESS;
+ }
+
default:
return VLC_EGENERIC;
}