summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2010-09-18 20:19:18 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2010-09-18 20:19:18 +0000
commitff19d16b916b309ae9f3b59de032d559d6b294f6 (patch)
treef561790cd719f0219b3d3b30d50f3a8da7eccf92
parent37f5a713de1ae1d6eadf8f62b140a3b5dbfdcb1f (diff)
10l: error in last commit. use decoder channels not encoder channels.
Originally committed as revision 25144 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index e43e6fbe5e..0a6964ee03 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -869,7 +869,7 @@ need_realloc:
double delta = get_sync_ipts(ost) * enc->sample_rate - ost->sync_opts
- av_fifo_size(ost->fifo)/(enc->channels * 2);
double idelta= delta*dec->sample_rate / enc->sample_rate;
- int byte_delta= ((int)idelta)*2*enc->channels;
+ int byte_delta= ((int)idelta)*2*dec->channels;
//FIXME resample delay
if(fabs(delta) > 50){