Skip to content

V
vlc-2-2
Commit 61466e06 authored by Ilkka Ollakka's avatar Ilkka Ollakka
Browse files
Options

transcode: check user videofilters when checking chroma/scale need

parent 23ab7c47
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
modules/stream_out/transcode/video.c
View file @ 61466e06
...@@ -347,16 +347,14 @@ static void transcode_video_filter_init( sout_stream_t *p_stream, ...@@ -347,16 +347,14 @@ static void transcode_video_filter_init( sout_stream_t *p_stream,
} }
/* Take care of the scaling and chroma conversions. /* Take care of the scaling and chroma conversions. */
*
* XXX: Shouldn't this really be after p_uf_chain, not p_f_chain,
* in case p_uf_chain changes the format?
*/
static void conversion_video_filter_append( sout_stream_id_t *id ) static void conversion_video_filter_append( sout_stream_id_t *id )
{ {
const es_format_t *p_fmt_out = &id->p_decoder->fmt_out; const es_format_t *p_fmt_out = &id->p_decoder->fmt_out;
if( id->p_f_chain ) if( id->p_f_chain )
p_fmt_out = filter_chain_GetFmtOut( id->p_f_chain ); p_fmt_out = filter_chain_GetFmtOut( id->p_f_chain );
if( id->p_uf_chain )
p_fmt_out = filter_chain_GetFmtOut( id->p_uf_chain );
if( ( p_fmt_out->video.i_chroma != id->p_encoder->fmt_in.video.i_chroma ) || if( ( p_fmt_out->video.i_chroma != id->p_encoder->fmt_in.video.i_chroma ) ||
( p_fmt_out->video.i_width != id->p_encoder->fmt_in.video.i_width ) || ( p_fmt_out->video.i_width != id->p_encoder->fmt_in.video.i_width ) ||
......
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