summaryrefslogtreecommitdiff
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorClément Bœsch <clement.boesch@smartjog.com>2012-01-31 15:51:01 +0100
committerClément Bœsch <ubitux@gmail.com>2012-01-31 17:44:46 +0100
commitc6736713330807b3971d52ba33df5ef3fa8e2e74 (patch)
treeed6a2d83f0b81b999d6028a77fca1e22150f36da /ffmpeg.c
parent151ecc2aecd81718e2520936dd3c537d7e6fe2fc (diff)
downloadffmpeg-c6736713330807b3971d52ba33df5ef3fa8e2e74.tar.gz
ffmpeg: fix -map_channel being ignored when resampling is not needed.
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 3c29f3251f..a794dd31dd 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1245,7 +1245,7 @@ need_realloc:
ost->sync_opts = lrintf(get_sync_ipts(ost) * enc->sample_rate) -
av_fifo_size(ost->fifo) / (enc->channels * osize); // FIXME wrong
- if (ost->audio_resample) {
+ if (ost->audio_resample || ost->audio_channels_mapped) {
buftmp = audio_buf;
size_out = swr_convert(ost->swr, ( uint8_t*[]){buftmp}, audio_buf_size / (enc->channels * osize),
(const uint8_t*[]){buf }, size / (dec->channels * isize));