Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'

* commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e': avplay: Do not print a possibly uninitialized value Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · 7ad528cf23
parent f5c5aa968c 06f4b1e37a
commit 7ad528cf23
1 changed files with 1 additions and 1 deletions
--- a/ffplay.c
+++ b/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) {