Merge branch 'review-1' of git://github.com/rayl/mlt

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1386 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index c9420fa..bc83b0b 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -597,9 +597,9 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                if ( mlt_properties_get_int( properties, "progressive" ) == 0 &&
                     mlt_properties_get_int( properties, "deinterlace" ) == 0 )
                {
-                       if ( mlt_properties_get_int( properties, "ildct" ) )
+                       if ( ! mlt_properties_get( properties, "ildct" ) || mlt_properties_get_int( properties, "ildct" ) )
                                c->flags |= CODEC_FLAG_INTERLACED_DCT;
-                       if ( mlt_properties_get_int( properties, "ilme" ) )
+                       if ( ! mlt_properties_get( properties, "ilme" ) || mlt_properties_get_int( properties, "ilme" ) )
                                c->flags |= CODEC_FLAG_INTERLACED_ME;
                }
                

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 7febf47..1ce2dca 100644 (file)
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -634,8 +634,8 @@ static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
        else
        {
                AVPicture output;
-               avpicture_fill( &output, buffer, PIX_FMT_YUV422, width, height );
-               img_convert( &output, PIX_FMT_YUV422, (AVPicture *)frame, pix_fmt, width, height );
+               avpicture_fill( &output, buffer, PIX_FMT_YUYV422, width, height );
+               img_convert( &output, PIX_FMT_YUYV422, (AVPicture *)frame, pix_fmt, width, height );
        }
 #endif
 }

diff --git a/src/modules/westley/producer_westley.c b/src/modules/westley/producer_westley.c
index 50b1beb..35f7739 100644 (file)
--- a/src/modules/westley/producer_westley.c
+++ b/src/modules/westley/producer_westley.c
@@ -173,7 +173,7 @@ static void track_service( mlt_properties properties, void *service, mlt_destruc
 static inline void qualify_property( deserialise_context context, mlt_properties properties, const char *name )
 {
        char *resource = mlt_properties_get( properties, name );
-       if ( resource != NULL )
+       if ( resource != NULL && resource[0] )
        {
                // Qualify file name properties 
                char *root = mlt_properties_get( context->producer_map, "root" );