OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
da56955
)
ffplay: fix nosync threshold check in synchronize_audio
author
Marton Balint
<cus@passwd.hu>
Sat, 6 Oct 2012 11:31:07 +0000
(13:31 +0200)
committer
Marton Balint
<cus@passwd.hu>
Sun, 21 Oct 2012 15:18:12 +0000
(17:18 +0200)
Signed-off-by: Marton Balint <cus@passwd.hu>
ffplay.c
patch
|
blob
|
history
diff --git
a/ffplay.c
b/ffplay.c
index
b3b09b3
..
5c5126b
100644
(file)
--- a/
ffplay.c
+++ b/
ffplay.c
@@
-1899,7
+1899,7
@@
static int synchronize_audio(VideoState *is, int nb_samples)
diff = get_audio_clock(is) - get_master_clock(is);
- if (
diff
< AV_NOSYNC_THRESHOLD) {
+ if (
fabs(diff)
< AV_NOSYNC_THRESHOLD) {
is->audio_diff_cum = diff + is->audio_diff_avg_coef * is->audio_diff_cum;
if (is->audio_diff_avg_count < AUDIO_DIFF_AVG_NB) {
/* not enough measures to have a correct estimate */