[FFmpeg-cvslog] src_movie: set the channel layout to default if the codec did not set it.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Sat Nov  5 21:21:47 2011 +0100| [68b531fe6aef7ef7f135bf33471990c19945a598] | committer: Michael Niedermayer

src_movie: set the channel layout to default if the codec did not set it.

Signed-off-by: Nicolas George <nicolas.george at normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68b531fe6aef7ef7f135bf33471990c19945a598
---

 libavfilter/src_movie.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c
index feb0285..206099c 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));