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)

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 97982ebc35367a427c9c9a7c192fa1e0cceb6fd4..062f70abaefcf1e76641f63addb00ad433c4fefe 100644 (file)
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -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; \

diff --git a/modules/codec/ffmpeg/ffmpeg.c b/modules/codec/ffmpeg/ffmpeg.c
index 13db60a5842c6eaa94f85a7ef92503088a398a71..7d6d107206dd5ee4805f47be0d0b9bbb9ecdc23e 100644 (file)
--- a/modules/codec/ffmpeg/ffmpeg.c
+++ b/modules/codec/ffmpeg/ffmpeg.c
@@ -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 );