aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-30 22:23:29 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-30 22:23:29 +0200
commit7ad528cf23da5479c7cbf4676d071a07a709d8b6 (patch)
treed27e00432884105a892daca51561b05b255cf0d7
parentf5c5aa968c3c96ff3968bd5b060e5a0f2f278732 (diff)
parent06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e (diff)
downloadffmpeg-7ad528cf23da5479c7cbf4676d071a07a709d8b6.tar.gz
Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'
* commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e': avplay: Do not print a possibly uninitialized value Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--ffplay.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffplay.c b/ffplay.c
index 4b97ea39ec..b042ba7a94 100644
--- 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) {