Merge commit '06f4b1e3'

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

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

ffplay.c

@@ -1531,7 +1531,7 @@ static void step_to_next_frame(VideoState *is)
 
 static double compute_target_delay(double delay, VideoState *is)
 {
-    double sync_threshold, diff;
+    double sync_threshold, diff = 0;
 
     /* update delay to follow master synchronisation source */
     if (get_master_sync_type(is) != AV_SYNC_VIDEO_MASTER) {