Fix (kdenlive-824) >2 channels not downmixed.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

diff --git a/src/melt/Makefile b/src/melt/Makefile
index 239bb393a298046afad2372017514f168173dd6c..3e9dc719f085c9edcaf695528b5cbce01e10fd57 100644 (file)
--- a/src/melt/Makefile
+++ b/src/melt/Makefile
@@ -1,6 +1,6 @@
 include ../../config.mak
 
-TARGET = melt
+TARGET = mlt-process
 
 OBJS = melt.o \
           io.o
@@ -15,6 +15,7 @@ all: $(TARGET)
 
 $(TARGET): $(OBJS)
                $(CC) -o $@ $(OBJS) $(LDFLAGS)
+               ln -sf $@ melt
 
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $^ 1>.depend
@@ -31,6 +32,7 @@ install:      all
 
 uninstall:
        rm -f "$(DESTDIR)$(bindir)/$(TARGET)"
+       rm -f "$(DESTDIR)$(bindir)/melt"
 
 ifneq ($(wildcard .depend),)
 include .depend

diff --git a/src/melt/melt.c b/src/melt/melt.c
index acb93a78600e4670e0368190c8924b3054cacc24..f72560959b323ce9d302fbaf989053fe873f0796 100644 (file)
--- a/src/melt/melt.c
+++ b/src/melt/melt.c
@@ -404,7 +404,7 @@ query_all:
                }
                else if ( !strcmp( argv[ i ], "-version" ) || !strcmp( argv[ i ], "--version" ) )
                {
-                       fprintf( stderr, "MLT melt " VERSION "\n"
+                       fprintf( stderr, "MLT mlt-process " VERSION "\n"
                                "Copyright (C) 2002-2009 Ushodaya Enterprises Limited\n"
                                "<http://www.mltframework.org/>\n"
                                "This is free software; see the source for copying conditions.  There is NO\n"
@@ -517,7 +517,7 @@ query_all:
        else
        {
                fprintf( stderr,
-"Usage: melt [options] [producer [name=value]* ]+\n"
+"Usage: mlt-process [options] [producer [name=value]* ]+\n"
 "Options:\n"
 "  -attach filter[:arg] [name=value]*       Attach a filter to the output\n"
 "  -attach-cut filter[:arg] [name=value]*   Attach a filter to a cut\n"

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 18add100883c1ad42df4021488980edbd095b417..1f386bbb54a96818c39d816995645c17a26799cf 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -1151,7 +1151,10 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        }
        else if ( resample == NULL )
        {
-               *channels = codec_context->channels;
+               // TODO: uncomment and remove following line when full multi-channel support is ready
+               // *channels = codec_context->channels;
+               codec_context->request_channels = *channels;
+
                *frequency = codec_context->sample_rate;
        }