Merge ../mlt

[melted] / src / modules / avformat / consumer_avformat.c

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 7757bb7..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;
                }
                
@@ -845,7 +845,7 @@ static void *consumer_thread( void *arg )
 
        // Determine the format
        AVOutputFormat *fmt = NULL;
-       char *filename = mlt_properties_get( properties, "target" );
+       const char *filename = mlt_properties_get( properties, "target" );
        char *format = mlt_properties_get( properties, "f" );
        char *vcodec = mlt_properties_get( properties, "vcodec" );
        char *acodec = mlt_properties_get( properties, "acodec" );
@@ -1338,7 +1338,7 @@ static void *consumer_thread( void *arg )
 
                // Remove the x264 dual pass logs
                char *cwd = getcwd( NULL, 0 );
-               char *file = "x264_2pass.log";
+               const char *file = "x264_2pass.log";
                char *full = malloc( strlen( cwd ) + strlen( file ) + 2 );
                sprintf( full, "%s/%s", cwd, file );
                remove( full );