[vlc-commits] transcode: fix picture release code

[Ilkka Ollakka]

vlc | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Wed Nov 20 16:29:03 2013 +0200| [ee8e8d6483608beb36d1aa81b84a27c66f08e89b] | committer: Ilkka Ollakka

transcode: fix picture release code

There was a bug that if you had threads but no fps it would release
p_pic that is in fifo for encoder and stuff happened. I introduced this
but in that lipsync change.

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

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

diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 6583772..a92f038 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -772,9 +772,9 @@ static void OutputFrame( sout_stream_sys_t *p_sys, picture_t *p_pic, sout_stream
                            ( date_Get( &id->interpolated_pts ) );
     }
 
-    if( p_sys->i_threads && p_sys->b_master_sync && p_pic2 )
+    if( p_sys->i_threads && p_pic2 )
         picture_Release( p_pic2 );
-    else
+    else if ( p_sys->i_threads == 0 )
         picture_Release( p_pic );
 }