aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-01-15 17:21:09 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-01-15 17:21:09 +0000
commit112c4b8796c36368ba77f9bd5572e8954200ead7 (patch)
tree7a8eda4b32f666dda2745728c6526b6bf708a167
parentf9329946d0024eaef5515d7d0aa39de3d140d604 (diff)
downloadffmpeg-112c4b8796c36368ba77f9bd5572e8954200ead7.tar.gz
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
-rw-r--r--ffplay.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffplay.c b/ffplay.c
index f385ad8305..1b83bb5a71 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) {