Merge branch 'master' into oldabi

* master:
  ffplay: do not init SDL audio if -an is specified.
  Fix zero-length gnu_printf format string warning.
  A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead.

Merged-by: Michael Niedermayer <[email protected]>

1 files changed, 1 insertions, 1 deletions

diff --git a/ffmpeg.c b/ffmpeg.c
index 2fab0b56f4..7c4cc3a527 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -446,7 +446,7 @@ static int configure_video_filters(AVInputStream *ist, AVOutputStream *ost)
 
 static void term_exit(void)
 {
-    av_log(NULL, AV_LOG_QUIET, "");
+    av_log(NULL, AV_LOG_QUIET, "%s", "");
 #if HAVE_TERMIOS_H
     if(!run_as_daemon)
         tcsetattr (0, TCSANOW, &oldtty);