summaryrefslogtreecommitdiff
path: root/libavfilter
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2011-11-05 21:21:47 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-11-06 01:19:56 +0100
commit68b531fe6aef7ef7f135bf33471990c19945a598 (patch)
treef0bffe5ecb0ffbc524147597dc72dfa2230e644b /libavfilter
parentea83b032af825d10f7d6db8a71933edce5b842a3 (diff)
src_movie: set the channel layout to default if the codec did not set it.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/src_movie.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index feb0285127..206099cec0 100644
--- a/libavfilter/src_movie.c
+++ b/libavfilter/src_movie.c
@@ -353,7 +353,8 @@ static int amovie_query_formats(AVFilterContext *ctx)
enum AVSampleFormat sample_fmts[] = { c->sample_fmt, -1 };
int packing_fmts[] = { AVFILTER_PACKED, -1 };
- int64_t chlayouts[] = { c->channel_layout, -1 };
+ int64_t chlayouts[] = { c->channel_layout ? c->channel_layout :
+ av_get_default_channel_layout(c->channels), -1 };
avfilter_set_common_sample_formats (ctx, avfilter_make_format_list(sample_fmts));
avfilter_set_common_packing_formats(ctx, avfilter_make_format_list(packing_fmts));