mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Merge commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e'
* commit '06f4b1e37a08f3fd269ecbfeb0181129e5bfc86e': avplay: Do not print a possibly uninitialized value Conflicts: ffplay.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7ad528cf23
2
ffplay.c
2
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) {
|
||||
|
Loading…
Reference in New Issue
Block a user