[vlc-commits] transcode: run user speficied videofilters before overlays

[Ilkka Ollakka]

vlc/vlc-1.2 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Sun Jan 22 19:01:35 2012 +0200| [6e8970fb2efae064c175128da322f3832950ee02] | committer: 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: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=6e8970fb2efae064c175128da322f3832950ee02
---

 modules/stream_out/transcode/video.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 4278d59..68c87b9 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -696,6 +696,10 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_t *id,
         if( id->p_f_chain )
             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
          */
@@ -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 )
         {
             block_t *p_block;