[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1785-gffb8692

[Gabriele Giacone]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  ffb86926275228436d4598ee8f33ab948c45ae2b (commit)
      from  9a9090dbddfc75d7284fa37259546b4eb6b1f72f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=ffb86926275228436d4598ee8f33ab948c45ae2b


commit ffb86926275228436d4598ee8f33ab948c45ae2b
Author: Gabriele Giacone <address@hidden>
Date:   Tue Sep 3 02:48:26 2013 +0200

    AudioResamplerFfmpeg.cpp: get default input channel layout.

diff --git a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp 
b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
index 81e2c49..41673b4 100644
--- a/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
+++ b/libmedia/ffmpeg/AudioResamplerFfmpeg.cpp
@@ -66,7 +66,8 @@ AudioResamplerFfmpeg::init(AVCodecContext* ctx) {
                 16, 10, 0, 0.8);
 #endif
 #if defined(HAVE_SWRESAMPLE_H) || defined(HAVE_AVRESAMPLE_H)
-            av_opt_set_int(_context, "in_channel_layout", ctx->channel_layout, 
0);
+            av_opt_set_int(_context, "in_channel_layout",
+                av_get_default_channel_layout(ctx->channels), 0);
             av_opt_set_int(_context, "out_channel_layout", 
AV_CH_LAYOUT_STEREO, 0);
             av_opt_set_int(_context, "in_sample_rate", ctx->sample_rate, 0);
             av_opt_set_int(_context, "out_sample_rate", 44100, 0);

-----------------------------------------------------------------------

Summary of changes:
 libmedia/ffmpeg/AudioResamplerFfmpeg.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash