vlc | branch: master | Steve Lhomme <[email protected]> | Fri Jul 7 10:37:50 2017 +0200| [5dbd54ec68836a3eb9c3613176081c0ebbcae275] | committer: Jean-Baptiste Kempf
decoder/packetizer: no need to set the output ES category anymore It's done when loading the decoder/packetizer. Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5dbd54ec68836a3eb9c3613176081c0ebbcae275 --- modules/codec/a52.c | 1 - modules/codec/adpcm.c | 1 - modules/codec/aes3.c | 1 - modules/codec/aom.c | 1 - modules/codec/araw.c | 1 - modules/codec/arib/aribsub.c | 1 - modules/codec/avcodec/audio.c | 1 - modules/codec/avcodec/subtitle.c | 1 - modules/codec/avcodec/video.c | 1 - modules/codec/bpg.c | 3 --- modules/codec/cc.c | 1 - modules/codec/cdg.c | 1 - modules/codec/crystalhd.c | 1 - modules/codec/cvdsub.c | 1 - modules/codec/daala.c | 1 - modules/codec/dca.c | 1 - modules/codec/dvbsub.c | 1 - modules/codec/faad.c | 1 - modules/codec/flac.c | 1 - modules/codec/fluidsynth.c | 1 - modules/codec/g711.c | 1 - modules/codec/gstreamer/gstdecode.c | 2 -- modules/codec/jpeg.c | 3 --- modules/codec/libass.c | 1 - modules/codec/libmpeg2.c | 1 - modules/codec/lpcm.c | 2 -- modules/codec/mad.c | 1 - modules/codec/mft.c | 1 - modules/codec/mpg123.c | 1 - modules/codec/oggspots.c | 1 - modules/codec/omxil/mediacodec.c | 1 - modules/codec/omxil/omxil.c | 1 - modules/codec/opus.c | 1 - modules/codec/png.c | 1 - modules/codec/schroedinger.c | 1 - modules/codec/sdl_image.c | 1 - modules/codec/spdif.c | 1 - modules/codec/speex.c | 1 - modules/codec/stl.c | 1 - modules/codec/subsdec.c | 1 - modules/codec/substx3g.c | 1 - modules/codec/subsusf.c | 1 - modules/codec/svg.c | 1 - modules/codec/telx.c | 1 - modules/codec/textst.c | 1 - modules/codec/theora.c | 1 - modules/codec/ttml/substtml.c | 1 - modules/codec/videotoolbox.m | 1 - modules/codec/vorbis.c | 1 - modules/codec/vpx.c | 1 - modules/codec/wmafixed/wma.c | 1 - modules/codec/xwd.c | 1 - modules/hw/mmal/codec.c | 1 - modules/packetizer/a52.c | 1 - modules/packetizer/dts.c | 1 - modules/packetizer/flac.c | 1 - modules/packetizer/mlp.c | 1 - modules/packetizer/mpeg4audio.c | 1 - modules/packetizer/mpegaudio.c | 1 - 59 files changed, 65 deletions(-) diff --git a/modules/codec/a52.c b/modules/codec/a52.c index 050611f055..aaf27e515e 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -352,7 +352,6 @@ static int Open( vlc_object_t *p_this ) p_dec->fmt_in.audio.i_physical_channels, p_sys->pi_chan_table ); - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.audio = p_dec->fmt_in.audio; #ifdef LIBA52_FIXED p_dec->fmt_out.audio.i_format = VLC_CODEC_S32N; diff --git a/modules/codec/adpcm.c b/modules/codec/adpcm.c index 301448ba1c..3abe252a23 100644 --- a/modules/codec/adpcm.c +++ b/modules/codec/adpcm.c @@ -275,7 +275,6 @@ static int OpenDecoder( vlc_object_t *p_this ) } p_dec->p_sys = p_sys; - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_S16N; p_dec->fmt_out.audio.i_rate = p_dec->fmt_in.audio.i_rate; p_dec->fmt_out.audio.i_channels = i_channels; diff --git a/modules/codec/aes3.c b/modules/codec/aes3.c index c68f455a0c..2df8363192 100644 --- a/modules/codec/aes3.c +++ b/modules/codec/aes3.c @@ -282,7 +282,6 @@ static int Open( decoder_t *p_dec, bool b_packetizer ) date_Set( &p_sys->end_date, 0 ); /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.audio.i_rate = 48000; /* Set callback */ diff --git a/modules/codec/aom.c b/modules/codec/aom.c index 0f68dd168e..aa3a5b8ef1 100644 --- a/modules/codec/aom.c +++ b/modules/codec/aom.c @@ -281,7 +281,6 @@ static int OpenDecoder(vlc_object_t *p_this) dec->pf_decode = Decode; - dec->fmt_out.i_cat = VIDEO_ES; dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; dec->fmt_out.i_codec = VLC_CODEC_I420; diff --git a/modules/codec/araw.c b/modules/codec/araw.c index e6206b4bc1..8318bfd055 100644 --- a/modules/codec/araw.c +++ b/modules/codec/araw.c @@ -271,7 +271,6 @@ static int DecoderOpen( vlc_object_t *p_this ) return VLC_ENOMEM; /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = format; p_dec->fmt_out.audio.i_format = format; p_dec->fmt_out.audio.i_rate = p_dec->fmt_in.audio.i_rate; diff --git a/modules/codec/arib/aribsub.c b/modules/codec/arib/aribsub.c index ad55c2e15f..9bcc92f37b 100644 --- a/modules/codec/arib/aribsub.c +++ b/modules/codec/arib/aribsub.c @@ -118,7 +118,6 @@ static int Open( vlc_object_t *p_this ) p_dec->p_sys = p_sys; p_dec->pf_decode = Decode; - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = 0; p_sys->b_a_profile = ( p_dec->fmt_in.i_codec == VLC_CODEC_ARIB_A ); diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c index e15d103a8a..4c3e929986 100644 --- a/modules/codec/avcodec/audio.c +++ b/modules/codec/avcodec/audio.c @@ -250,7 +250,6 @@ int InitAudioDec( vlc_object_t *obj ) p_sys->i_previous_layout = 0; /* */ - p_dec->fmt_out.i_cat = AUDIO_ES; /* Try to set as much information as possible but do not trust it */ SetupOutputFormat( p_dec, false ); diff --git a/modules/codec/avcodec/subtitle.c b/modules/codec/avcodec/subtitle.c index 3495caea0b..6b9b67445c 100644 --- a/modules/codec/avcodec/subtitle.c +++ b/modules/codec/avcodec/subtitle.c @@ -122,7 +122,6 @@ int InitSubtitleDec(vlc_object_t *obj) /* */ msg_Dbg(dec, "libavcodec codec (%s) started", codec->name); - dec->fmt_out.i_cat = SPU_ES; dec->pf_decode = DecodeSubtitle; dec->pf_flush = Flush; diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 711c9b0e55..506d15a209 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -571,7 +571,6 @@ int InitVideoDec( vlc_object_t *obj ) p_sys->b_from_preroll = false; /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS ) { /* we are doomed. but not really, because most codecs set their pix_fmt later on */ diff --git a/modules/codec/bpg.c b/modules/codec/bpg.c index 9df706c47d..28b0167a18 100644 --- a/modules/codec/bpg.c +++ b/modules/codec/bpg.c @@ -76,9 +76,6 @@ static int OpenDecoder(vlc_object_t *p_this) return VLC_EGENERIC; } - /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; - /* Set callbacks */ p_dec->pf_decode = DecodeBlock; diff --git a/modules/codec/cc.c b/modules/codec/cc.c index 030771ff07..f7ef1e821a 100644 --- a/modules/codec/cc.c +++ b/modules/codec/cc.c @@ -278,7 +278,6 @@ static int Open( vlc_object_t *p_this ) p_sys->b_opaque = var_InheritBool( p_dec, "cc-opaque" ); p_sys->i_reorder_depth = p_dec->fmt_in.subs.cc.i_reorder_depth; - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = VLC_CODEC_TEXT; return VLC_SUCCESS; diff --git a/modules/codec/cdg.c b/modules/codec/cdg.c index f9d45d3991..084fc3b61b 100644 --- a/modules/codec/cdg.c +++ b/modules/codec/cdg.c @@ -113,7 +113,6 @@ static int Open( vlc_object_t *p_this ) /* Set output properties * TODO maybe it would be better to use RV16 or RV24 ? */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_RGB32; p_dec->fmt_out.video.i_width = CDG_DISPLAY_WIDTH; p_dec->fmt_out.video.i_height = CDG_DISPLAY_HEIGHT; diff --git a/modules/codec/crystalhd.c b/modules/codec/crystalhd.c index ae85ddfa94..edb597f9e6 100644 --- a/modules/codec/crystalhd.c +++ b/modules/codec/crystalhd.c @@ -344,7 +344,6 @@ static int OpenDecoder( vlc_object_t *p_this ) } /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_YUYV; p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width; p_dec->fmt_out.video.i_height = p_dec->fmt_in.video.i_height; diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c index 313b103458..e8c14c6ba5 100644 --- a/modules/codec/cvdsub.c +++ b/modules/codec/cvdsub.c @@ -125,7 +125,6 @@ static int DecoderOpen( vlc_object_t *p_this ) p_dec->pf_decode = Decode; p_dec->pf_packetize = Packetize; - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = VLC_CODEC_YUVP; return VLC_SUCCESS; diff --git a/modules/codec/daala.c b/modules/codec/daala.c index ba1ce9d059..95e61bb9ff 100644 --- a/modules/codec/daala.c +++ b/modules/codec/daala.c @@ -180,7 +180,6 @@ static int OpenDecoder( vlc_object_t *p_this ) p_sys->dcx = NULL; /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_I420; /* Set callbacks */ diff --git a/modules/codec/dca.c b/modules/codec/dca.c index 8415c8f3bb..72c080ebe7 100644 --- a/modules/codec/dca.c +++ b/modules/codec/dca.c @@ -322,7 +322,6 @@ static int Open( vlc_object_t *p_this ) p_dec->fmt_in.audio.i_physical_channels, p_sys->pi_chan_table ); - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.audio = p_dec->fmt_in.audio; p_dec->fmt_out.audio.i_format = VLC_CODEC_FL32; p_dec->fmt_out.i_codec = p_dec->fmt_out.audio.i_format; diff --git a/modules/codec/dvbsub.c b/modules/codec/dvbsub.c index 568ccdfbc5..97a563e638 100644 --- a/modules/codec/dvbsub.c +++ b/modules/codec/dvbsub.c @@ -367,7 +367,6 @@ static int Open( vlc_object_t *p_this ) p_sys->i_spu_y = i_posy; } - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = 0; default_clut_init( p_dec ); diff --git a/modules/codec/faad.c b/modules/codec/faad.c index ec9e2abb6b..db0e29d158 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -129,7 +129,6 @@ static int Open( vlc_object_t *p_this ) /* Misc init */ date_Set( &p_sys->date, 0 ); - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = HAVE_FPU ? VLC_CODEC_FL32 : VLC_CODEC_S16N; diff --git a/modules/codec/flac.c b/modules/codec/flac.c index 7a831cca7f..ee51e4b233 100644 --- a/modules/codec/flac.c +++ b/modules/codec/flac.c @@ -488,7 +488,6 @@ static int OpenDecoder( vlc_object_t *p_this ) #endif /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_S32N; /* Set callbacks */ diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c index 54b3f1d0f4..37603f180c 100644 --- a/modules/codec/fluidsynth.c +++ b/modules/codec/fluidsynth.c @@ -167,7 +167,6 @@ static int Open (vlc_object_t *p_this) fluid_synth_set_reverb_on (p_sys->synth, var_InheritBool (p_this, "synth-reverb")); - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.audio.i_rate = var_InheritInteger (p_this, "synth-sample-rate");; fluid_synth_set_sample_rate (p_sys->synth, p_dec->fmt_out.audio.i_rate); diff --git a/modules/codec/g711.c b/modules/codec/g711.c index e938efb637..92a80606c1 100644 --- a/modules/codec/g711.c +++ b/modules/codec/g711.c @@ -188,7 +188,6 @@ static int DecoderOpen( vlc_object_t *p_this ) p_dec->pf_flush = Flush; p_dec->p_sys = p_sys; - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_S16N; p_dec->fmt_out.audio.i_format = VLC_CODEC_S16N; p_dec->fmt_out.audio.i_rate = p_dec->fmt_in.audio.i_rate; diff --git a/modules/codec/gstreamer/gstdecode.c b/modules/codec/gstreamer/gstdecode.c index 1f4fb31d1a..05aa500205 100644 --- a/modules/codec/gstreamer/gstdecode.c +++ b/modules/codec/gstreamer/gstdecode.c @@ -600,8 +600,6 @@ static int OpenDecoder( vlc_object_t *p_this ) VLC_EGENERIC ); } - p_dec->fmt_out.i_cat = p_dec->fmt_in.i_cat; - /* set the pipeline to playing */ i_ret = gst_element_set_state( p_sys->p_decoder, GST_STATE_PLAYING ); VLC_GST_CHECK( i_ret, GST_STATE_CHANGE_FAILURE, diff --git a/modules/codec/jpeg.c b/modules/codec/jpeg.c index 219fef9b31..c3119db968 100644 --- a/modules/codec/jpeg.c +++ b/modules/codec/jpeg.c @@ -174,9 +174,6 @@ static int OpenDecoder(vlc_object_t *p_this) p_sys->err.error_exit = user_error_exit; p_sys->err.output_message = user_error_message; - /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; - /* Set callbacks */ p_dec->pf_decode = DecodeBlock; diff --git a/modules/codec/libass.c b/modules/codec/libass.c index 2875e76e6c..cbc0fd2279 100644 --- a/modules/codec/libass.c +++ b/modules/codec/libass.c @@ -252,7 +252,6 @@ static int Create( vlc_object_t *p_this ) } ass_process_codec_private( p_track, p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra ); - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = VLC_CODEC_RGBA; return VLC_SUCCESS; diff --git a/modules/codec/libmpeg2.c b/modules/codec/libmpeg2.c index 999aa24a4a..4105e69c9a 100644 --- a/modules/codec/libmpeg2.c +++ b/modules/codec/libmpeg2.c @@ -242,7 +242,6 @@ static int OpenDecoder( vlc_object_t *p_this ) p_dec->pf_decode = DecodeVideo; p_dec->pf_flush = Reset; - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = 0; return VLC_SUCCESS; diff --git a/modules/codec/lpcm.c b/modules/codec/lpcm.c index eba8ba0f92..d713c2b632 100644 --- a/modules/codec/lpcm.c +++ b/modules/codec/lpcm.c @@ -259,8 +259,6 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer ) p_sys->i_chans_to_reorder = 0; /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; - if( b_packetizer ) { switch( i_type ) diff --git a/modules/codec/mad.c b/modules/codec/mad.c index d95d3d7b72..b9ec59f4f5 100644 --- a/modules/codec/mad.c +++ b/modules/codec/mad.c @@ -267,7 +267,6 @@ static int Open( vlc_object_t *p_this ) mad_synth_init( &p_sys->mad_synth ); mad_stream_options( &p_sys->mad_stream, MAD_OPTION_IGNORECRC ); - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.audio = p_dec->fmt_in.audio; p_dec->fmt_out.audio.i_format = VLC_CODEC_FL32; p_dec->fmt_out.i_codec = p_dec->fmt_out.audio.i_format; diff --git a/modules/codec/mft.c b/modules/codec/mft.c index 364b61aa99..8fc6ff532b 100644 --- a/modules/codec/mft.c +++ b/modules/codec/mft.c @@ -1141,7 +1141,6 @@ static int Open(vlc_object_t *p_this) goto error; p_dec->pf_decode = p_sys->is_async ? DecodeAsync : DecodeSync; - p_dec->fmt_out.i_cat = p_dec->fmt_in.i_cat; return VLC_SUCCESS; diff --git a/modules/codec/mpg123.c b/modules/codec/mpg123.c index 52b5921b7a..4ab9d6cd5f 100644 --- a/modules/codec/mpg123.c +++ b/modules/codec/mpg123.c @@ -372,7 +372,6 @@ static int OpenDecoder( vlc_object_t *p_this ) p_dec->fmt_in.i_codec != VLC_CODEC_MP3 ) return VLC_EGENERIC; - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_FL32; /* Initialize libmpg123 */ diff --git a/modules/codec/oggspots.c b/modules/codec/oggspots.c index 9d4596d745..c6601ba1ae 100644 --- a/modules/codec/oggspots.c +++ b/modules/codec/oggspots.c @@ -118,7 +118,6 @@ static int OpenDecoder(vlc_object_t* p_this) p_sys->i_pts = VLC_TS_INVALID; /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_RGBA; /* Initialize image handler */ diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c index cf56a38ef1..3373a7293e 100644 --- a/modules/codec/omxil/mediacodec.c +++ b/modules/codec/omxil/mediacodec.c @@ -614,7 +614,6 @@ static int OpenDecoder(vlc_object_t *p_this, pf_MediaCodecApi_init pf_init) p_dec->p_sys = p_sys; - p_dec->fmt_out.i_cat = p_dec->fmt_in.i_cat; p_dec->fmt_out.video = p_dec->fmt_in.video; p_dec->fmt_out.audio = p_dec->fmt_in.audio; p_dec->fmt_out.video.i_visible_width = p_dec->fmt_out.video.i_width; diff --git a/modules/codec/omxil/omxil.c b/modules/codec/omxil/omxil.c index 4451c6efb9..b8812a95fc 100644 --- a/modules/codec/omxil/omxil.c +++ b/modules/codec/omxil/omxil.c @@ -1078,7 +1078,6 @@ static int OpenGeneric( vlc_object_t *p_this, bool b_encode ) /* Initialise the thread properties */ if(!b_encode) { - p_dec->fmt_out.i_cat = p_dec->fmt_in.i_cat; p_dec->fmt_out.video = p_dec->fmt_in.video; p_dec->fmt_out.audio = p_dec->fmt_in.audio; p_dec->fmt_out.i_codec = 0; diff --git a/modules/codec/opus.c b/modules/codec/opus.c index a5953bc231..22d40949d7 100644 --- a/modules/codec/opus.c +++ b/modules/codec/opus.c @@ -182,7 +182,6 @@ static int OpenDecoder( vlc_object_t *p_this ) date_Set( &p_sys->end_date, 0 ); /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_FL32; p_dec->pf_decode = DecodeAudio; diff --git a/modules/codec/png.c b/modules/codec/png.c index f82a80788e..645577f7ca 100644 --- a/modules/codec/png.c +++ b/modules/codec/png.c @@ -123,7 +123,6 @@ static int OpenDecoder( vlc_object_t *p_this ) p_dec->p_sys->p_obj = p_this; /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_RGBA; /* Set callbacks */ diff --git a/modules/codec/schroedinger.c b/modules/codec/schroedinger.c index d8ab310d28..405d2b4382 100644 --- a/modules/codec/schroedinger.c +++ b/modules/codec/schroedinger.c @@ -584,7 +584,6 @@ static int OpenDecoder( vlc_object_t *p_this ) p_sys->i_frame_pts_delta = 0; /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_I420; /* Set callbacks */ diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c index 463b1be91d..65a1223e1a 100644 --- a/modules/codec/sdl_image.c +++ b/modules/codec/sdl_image.c @@ -112,7 +112,6 @@ static int OpenDecoder( vlc_object_t *p_this ) p_sys->psz_sdl_type = p_supported_fmt[i].psz_sdl_type; /* Set output properties - this is a decoy and isn't used anywhere */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_RGB32; /* Set callbacks */ diff --git a/modules/codec/spdif.c b/modules/codec/spdif.c index db25526781..efd8cb6576 100644 --- a/modules/codec/spdif.c +++ b/modules/codec/spdif.c @@ -73,7 +73,6 @@ OpenDecoder(vlc_object_t *p_this) } /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec; p_dec->fmt_out.audio = p_dec->fmt_in.audio; p_dec->fmt_out.audio.i_format = p_dec->fmt_out.i_codec; diff --git a/modules/codec/speex.c b/modules/codec/speex.c index 9ada14c7a1..aa18d112e7 100644 --- a/modules/codec/speex.c +++ b/modules/codec/speex.c @@ -224,7 +224,6 @@ static int OpenDecoder( vlc_object_t *p_this ) date_Set( &p_sys->end_date, 0 ); /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_S16N; /* diff --git a/modules/codec/stl.c b/modules/codec/stl.c index 38b60e1f7e..4c73c1c067 100644 --- a/modules/codec/stl.c +++ b/modules/codec/stl.c @@ -480,7 +480,6 @@ static int Open(vlc_object_t *object) dec->p_sys = sys; dec->pf_decode = Decode; - dec->fmt_out.i_cat = SPU_ES; dec->fmt_out.i_codec = 0; return VLC_SUCCESS; } diff --git a/modules/codec/subsdec.c b/modules/codec/subsdec.c index 4bfa952c00..27537b507c 100644 --- a/modules/codec/subsdec.c +++ b/modules/codec/subsdec.c @@ -234,7 +234,6 @@ static int OpenDecoder( vlc_object_t *p_this ) } p_dec->pf_decode = DecodeBlock; - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = 0; /* Allocate the memory needed to store the decoder's structure */ diff --git a/modules/codec/substx3g.c b/modules/codec/substx3g.c index c8ab896e28..0035b97422 100644 --- a/modules/codec/substx3g.c +++ b/modules/codec/substx3g.c @@ -61,7 +61,6 @@ static int Open( vlc_object_t *p_this ) p_dec->pf_decode = Decode; - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = 0; if( p_dec->fmt_out.subs.p_style ) { diff --git a/modules/codec/subsusf.c b/modules/codec/subsusf.c index 14b07e051a..7e4a66e8d6 100644 --- a/modules/codec/subsusf.c +++ b/modules/codec/subsusf.c @@ -127,7 +127,6 @@ static int OpenDecoder( vlc_object_t *p_this ) return VLC_ENOMEM; p_dec->pf_decode = DecodeBlock; - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = 0; /* init of p_sys */ diff --git a/modules/codec/svg.c b/modules/codec/svg.c index 6b6dcd384a..9b76e3d62f 100644 --- a/modules/codec/svg.c +++ b/modules/codec/svg.c @@ -108,7 +108,6 @@ static int OpenDecoder( vlc_object_t *p_this ) #endif /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_BGRA; /* Set callbacks */ diff --git a/modules/codec/telx.c b/modules/codec/telx.c index c25653bd7f..6644fa32c4 100644 --- a/modules/codec/telx.c +++ b/modules/codec/telx.c @@ -183,7 +183,6 @@ static int Open( vlc_object_t *p_this ) p_sys = p_dec->p_sys = calloc( 1, sizeof(*p_sys) ); if( p_sys == NULL ) return VLC_ENOMEM; - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = 0; p_sys->i_align = 0; diff --git a/modules/codec/textst.c b/modules/codec/textst.c index d48c88b2cc..c5c414f1cb 100644 --- a/modules/codec/textst.c +++ b/modules/codec/textst.c @@ -273,7 +273,6 @@ static int Open(vlc_object_t *object) p_dec->p_sys = p_sys; p_dec->pf_decode = Decode; - p_dec->fmt_out.i_cat = SPU_ES; p_dec->fmt_out.i_codec = 0; return VLC_SUCCESS; diff --git a/modules/codec/theora.c b/modules/codec/theora.c index 43404adc5a..14401263f4 100644 --- a/modules/codec/theora.c +++ b/modules/codec/theora.c @@ -166,7 +166,6 @@ static int OpenDecoder( vlc_object_t *p_this ) p_sys->tcx = NULL; /* Set output properties */ - p_dec->fmt_out.i_cat = VIDEO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_I420; /* Set callbacks */ diff --git a/modules/codec/ttml/substtml.c b/modules/codec/ttml/substtml.c index 84f13f5bab..ea540ba834 100644 --- a/modules/codec/ttml/substtml.c +++ b/modules/codec/ttml/substtml.c @@ -976,7 +976,6 @@ int OpenDecoder( vlc_object_t *p_this ) return VLC_ENOMEM; p_dec->pf_decode = DecodeBlock; - p_dec->fmt_out.i_cat = SPU_ES; p_sys->i_align = var_InheritInteger( p_dec, "ttml-align" ); return VLC_SUCCESS; diff --git a/modules/codec/videotoolbox.m b/modules/codec/videotoolbox.m index 7806bd7843..e7668d0b78 100644 --- a/modules/codec/videotoolbox.m +++ b/modules/codec/videotoolbox.m @@ -868,7 +868,6 @@ static int OpenDecoder(vlc_object_t *p_this) vlc_mutex_init(&p_sys->lock); /* return our proper VLC internal state */ - p_dec->fmt_out.i_cat = p_dec->fmt_in.i_cat; p_dec->fmt_out.video = p_dec->fmt_in.video; if (!p_dec->fmt_out.video.i_sar_num || !p_dec->fmt_out.video.i_sar_den) { diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c index 4623e38a1e..592354d9ce 100644 --- a/modules/codec/vorbis.c +++ b/modules/codec/vorbis.c @@ -254,7 +254,6 @@ static int OpenDecoder( vlc_object_t *p_this ) vorbis_comment_init( &p_sys->vc ); /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; #ifdef MODULE_NAME_IS_tremor p_dec->fmt_out.i_codec = VLC_CODEC_S32N; #else diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c index 6ec6143102..ccf6407f9d 100644 --- a/modules/codec/vpx.c +++ b/modules/codec/vpx.c @@ -323,7 +323,6 @@ static int OpenDecoder(vlc_object_t *p_this) dec->pf_decode = Decode; - dec->fmt_out.i_cat = VIDEO_ES; dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; diff --git a/modules/codec/wmafixed/wma.c b/modules/codec/wmafixed/wma.c index d62c64c866..1d65b89174 100644 --- a/modules/codec/wmafixed/wma.c +++ b/modules/codec/wmafixed/wma.c @@ -139,7 +139,6 @@ static int OpenDecoder( vlc_object_t *p_this ) date_Init( &p_sys->end_date, p_dec->fmt_in.audio.i_rate, 1 ); /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_S32N; p_dec->fmt_out.audio.i_bitspersample = p_dec->fmt_in.audio.i_bitspersample; p_dec->fmt_out.audio.i_rate = p_dec->fmt_in.audio.i_rate; diff --git a/modules/codec/xwd.c b/modules/codec/xwd.c index 3239678f55..3e26b0be9f 100644 --- a/modules/codec/xwd.c +++ b/modules/codec/xwd.c @@ -52,7 +52,6 @@ static int Open(vlc_object_t *obj) dec->pf_decode = Decode; es_format_Copy(&dec->fmt_out, &dec->fmt_in); dec->fmt_out.i_codec = VLC_CODEC_RGB32; - dec->fmt_out.i_cat = VIDEO_ES; return VLC_SUCCESS; } diff --git a/modules/hw/mmal/codec.c b/modules/hw/mmal/codec.c index b816473c61..32ffe0e311 100644 --- a/modules/hw/mmal/codec.c +++ b/modules/hw/mmal/codec.c @@ -232,7 +232,6 @@ static int OpenDecoder(decoder_t *dec) dec->fmt_out.video.i_chroma = VLC_CODEC_I420; } - dec->fmt_out.i_cat = VIDEO_ES; dec->pf_decode = decode; dec->pf_flush = flush_decoder; diff --git a/modules/packetizer/a52.c b/modules/packetizer/a52.c index 1d66a538ef..41a4a9955c 100644 --- a/modules/packetizer/a52.c +++ b/modules/packetizer/a52.c @@ -334,7 +334,6 @@ static int Open( vlc_object_t *p_this ) block_BytestreamInit( &p_sys->bytestream ); /* Set output properties (Passthrough ONLY) */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec; p_dec->fmt_out.audio = p_dec->fmt_in.audio; diff --git a/modules/packetizer/dts.c b/modules/packetizer/dts.c index 2d4c9dbb7f..12ec0a6708 100644 --- a/modules/packetizer/dts.c +++ b/modules/packetizer/dts.c @@ -360,7 +360,6 @@ static int Open( vlc_object_t *p_this ) block_BytestreamInit( &p_sys->bytestream ); /* Set output properties (passthrough only) */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec; p_dec->fmt_out.audio = p_dec->fmt_in.audio; diff --git a/modules/packetizer/flac.c b/modules/packetizer/flac.c index 2a945a0403..eca86fa505 100644 --- a/modules/packetizer/flac.c +++ b/modules/packetizer/flac.c @@ -808,7 +808,6 @@ static int Open(vlc_object_t *p_this) /* */ es_format_Copy(&p_dec->fmt_out, &p_dec->fmt_in); - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_FLAC; p_dec->fmt_out.b_packetized = true; diff --git a/modules/packetizer/mlp.c b/modules/packetizer/mlp.c index 6bc1404ff2..389fefe687 100644 --- a/modules/packetizer/mlp.c +++ b/modules/packetizer/mlp.c @@ -488,7 +488,6 @@ static int Open( vlc_object_t *p_this ) p_sys->b_discontinuity = false; /* Set output properties (Passthrough only) */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = p_dec->fmt_in.i_codec; p_dec->fmt_out.audio.i_rate = 0; diff --git a/modules/packetizer/mpeg4audio.c b/modules/packetizer/mpeg4audio.c index 88670e3a60..45ff7e2af7 100644 --- a/modules/packetizer/mpeg4audio.c +++ b/modules/packetizer/mpeg4audio.c @@ -220,7 +220,6 @@ static int OpenPacketizer(vlc_object_t *p_this) p_sys->i_warnings = 0; /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_MP4A; msg_Dbg(p_dec, "running MPEG4 audio packetizer"); diff --git a/modules/packetizer/mpegaudio.c b/modules/packetizer/mpegaudio.c index 43043df6af..66137c0006 100644 --- a/modules/packetizer/mpegaudio.c +++ b/modules/packetizer/mpegaudio.c @@ -635,7 +635,6 @@ static int Open( vlc_object_t *p_this ) p_sys->i_bit_rate = 0; /* Set output properties */ - p_dec->fmt_out.i_cat = AUDIO_ES; p_dec->fmt_out.i_codec = VLC_CODEC_MPGA; p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
