1. ffmpeg
  2. Commit 7ad528cf23da5479c7cbf4676d071a07a709d8b6
Browse code

Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'

* commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e':
avplay: Do not print a possibly uninitialized value

Conflicts:
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2015/05/01 05:23:29
Showing 1 changed files
ffplay.c
History View file @ 7ad528c
... ... 
@@ -1531,7 +1531,7 @@ static void step_to_next_frame(VideoState *is)
1531 1531
1532 1532 
 static double compute_target_delay(double delay, VideoState *is)
1533 1533 
 {
1534 
-    double sync_threshold, diff;
1534 
+    double sync_threshold, diff = 0;
1535 1535
1536 1536 
     /* update delay to follow master synchronisation source */
1537 1537 
     if (get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER) {