aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-12-01 04:06:59 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-12-01 04:06:59 +0100
commit03b60509cb929efce8bf9de0249682cd3e2de963 (patch)
tree0f133e07ab20c1503937a8dde448917133a2df6f /ffmpeg.c
parentec20fc15818598aaf83232db3df2c85b1752c49a (diff)
downloadffmpeg-03b60509cb929efce8bf9de0249682cd3e2de963.tar.gz
ffmpeg: fix changing sample rate handling
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 2e8aae085d..f87ab63d6a 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -876,7 +876,9 @@ need_realloc:
}
if (enc->channels != dec->channels
- || enc->sample_fmt != dec->sample_fmt)
+ || enc->sample_fmt != dec->sample_fmt
+ || enc->sample_rate!= dec->sample_rate
+ )
ost->audio_resample = 1;
resample_changed = ost->resample_sample_fmt != dec->sample_fmt ||