[FFmpeg-cvslog] commit: In ffplay, do not open display if -nodisp is set. ( Stefano Sabatini )

git at videolan.org git
Sat Jan 15 19:37:54 CET 2011


ffmpeg | branch: master | Stefano Sabatini <stefano.sabatini-lala at poste.it> | Sat Jan 15 17:21:09 2011 +0000| [112c4b8796c36368ba77f9bd5572e8954200ead7] | committer: Stefano Sabatini 

In ffplay, do not open display if -nodisp is set.

Fixes issue 1017.

Originally committed as revision 26371 to svn://svn.ffmpeg.org/ffmpeg/trunk

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=112c4b8796c36368ba77f9bd5572e8954200ead7
---

 ffplay.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/ffplay.c b/ffplay.c
index f385ad8..1b83bb5 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -1242,6 +1242,7 @@ retry:
             }
 
             /* display picture */
+            if (!display_disable)
             video_display(is);
 
             /* update queue size and signal for next picture */
@@ -1260,6 +1261,7 @@ retry:
            than nothing, just to test the implementation */
 
         /* display picture */
+        if (!display_disable)
         video_display(is);
     }
     if (show_status) {




More information about the ffmpeg-cvslog mailing list