Commit bd394308 authored by Laurent Aimar's avatar Laurent Aimar
Browse files

ffmpeg: ask a packetizer for audio too (needed since ffmpeg r6098,

	fixed mpeg audio decoding)
vlc_demux.h: fixed COMMON_INIT_PACKETIZER (create a packetizer and not a decoder,
	fixed mpeg audio packetizer)
parent 2f1ab714
......@@ -188,7 +188,7 @@ static inline vlc_bool_t isDemux( demux_t *p_demux, const char *psz_requested )
#define POKE( peek, stuff, size ) (strncasecmp( (char *)peek, stuff, size )==0)
#define COMMON_INIT_PACKETIZER( location ) \
location = vlc_object_create( p_demux, VLC_OBJECT_DECODER ); \
location = vlc_object_create( p_demux, VLC_OBJECT_PACKETIZER ); \
location->pf_decode_audio = 0; \
location->pf_decode_video = 0; \
location->pf_decode_sub = 0; \
......
......@@ -306,10 +306,10 @@ static int OpenDecoder( vlc_object_t *p_this )
p_context->dsp_mask |= FF_MM_SSE2;
}
p_dec->b_need_packetized = VLC_TRUE;
switch( i_cat )
{
case VIDEO_ES:
p_dec->b_need_packetized = VLC_TRUE;
p_dec->pf_decode_video = E_(DecodeVideo);
i_result = E_( InitVideoDec )( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment