Commit 6e8970fb authored by Ilkka Ollakka's avatar Ilkka Ollakka Committed by Jean-Baptiste Kempf

transcode: run user speficied videofilters before overlays

For example crop/pad can change p_enc.in values, so run soverlay
in part that they are actually correct in p_pict.
(cherry picked from commit 82e22a4443bc431c4b0c759883db2960b492d97c)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 3a16f37e
...@@ -696,6 +696,10 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -696,6 +696,10 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,
if( id->p_f_chain ) if( id->p_f_chain )
p_pic = filter_chain_VideoFilter( id->p_f_chain, p_pic ); p_pic = filter_chain_VideoFilter( id->p_f_chain, p_pic );
/* Run user specified filter chain */
if( id->p_uf_chain )
p_pic = filter_chain_VideoFilter( id->p_uf_chain, p_pic );
/* /*
* Encoding * Encoding
*/ */
...@@ -737,10 +741,6 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id, ...@@ -737,10 +741,6 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,
} }
} }
/* Run user specified filter chain */
if( id->p_uf_chain )
p_pic = filter_chain_VideoFilter( id->p_uf_chain, p_pic );
if( p_sys->i_threads == 0 ) if( p_sys->i_threads == 0 )
{ {
block_t *p_block; block_t *p_block;
......
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