aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-07-02 13:25:04 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-07-02 13:25:04 +0000
commitf41dd5aad5623511013b239c6371b319459f84cf (patch)
tree80f6f18e3ac9ec273a50dccdf9f7aa8521d1ec7e /ffmpeg.c
parent9ff18a70895e246148980d5b7450ed0f22d3717c (diff)
downloadffmpeg-f41dd5aad5623511013b239c6371b319459f84cf.tar.gz
100l(audio sync) fix by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
Originally committed as revision 3283 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 2222a5f424..fc8169ec74 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -442,7 +442,7 @@ static void do_audio_out(AVFormatContext *s,
if(fabs(delta) > 50){
if(ist->is_start){
if(byte_delta < 0){
- byte_delta= FFMIN(byte_delta, size);
+ byte_delta= FFMAX(byte_delta, -size);
size += byte_delta;
buf -= byte_delta;
if(verbose > 2)