avformat/configure: update the recommended ffmpeg revision

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

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index ba433bf..87e3f5f 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -31,6 +31,7 @@
 #include <pthread.h>
 #include <sys/time.h>
 #include <math.h>
+#include <unistd.h>
 
 // avformat header files
 #include <avformat.h>
@@ -314,7 +315,9 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
                const char *opt_name = mlt_properties_get_name( properties, i );
                const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
                if ( opt != NULL )
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
+                       av_set_string3( obj, opt_name, mlt_properties_get( properties, opt_name), 0, NULL );
+#elif LIBAVCODEC_VERSION_INT >= ((51<<16)+(59<<8)+0)
                        av_set_string2( obj, opt_name, mlt_properties_get( properties, opt_name), 0 );
 #else
                        av_set_string( obj, opt_name, mlt_properties_get( properties, opt_name) );
@@ -501,7 +504,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                        }
                        else if ( ar == 16.0/15.0 ) // 4:3 PAL
                        {
-                               c->sample_aspect_ratio.num = 159;
+                               c->sample_aspect_ratio.num = 59;
                                c->sample_aspect_ratio.den = 54;
                        }
                        else if ( ar == 32.0/27.0 ) // 16:9 NTSC
@@ -512,7 +515,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                        else // 16:9 PAL
                        {
                                c->sample_aspect_ratio.num = 118;
-                               c->sample_aspect_ratio.den = 81;
+                               c->sample_aspect_ratio.den = 82;
                        }
                }
                else if ( mlt_properties_get( properties, "aspect" ) )
@@ -625,7 +628,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                        c->flags |= CODEC_FLAG_PASS1;
                else if ( i == 2 )
                        c->flags |= CODEC_FLAG_PASS2;
-               if ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) )
+               if ( codec_id != CODEC_ID_H264 && ( c->flags & ( CODEC_FLAG_PASS1 | CODEC_FLAG_PASS2 ) ) )
                {
                        char logfilename[1024];
                        FILE *f;
@@ -652,6 +655,7 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
                                }
                                else
                                {
+                                       mlt_properties_set( properties, "_logfilename", logfilename );
                                        fseek( f, 0, SEEK_END );
                                        size = ftell( f );
                                        fseek( f, 0, SEEK_SET );
@@ -1310,6 +1314,28 @@ static void *consumer_thread( void *arg )
 
        mlt_consumer_stopped( this );
 
+       if ( mlt_properties_get_int( properties, "pass" ) == 2 )
+       {
+               // Remove the dual pass log file
+               if ( mlt_properties_get( properties, "_logfilename" ) )
+                       remove( mlt_properties_get( properties, "_logfilename" ) );
+
+               // Remove the x264 dual pass logs
+               char *cwd = getcwd( NULL, 0 );
+               char *file = "x264_2pass.log";
+               char *full = malloc( strlen( cwd ) + strlen( file ) + 2 );
+               sprintf( full, "%s/%s", cwd, file );
+               remove( full );
+               free( full );
+               file = "x264_2pass.log.temp";
+               full = malloc( strlen( cwd ) + strlen( file ) + 2 );
+               sprintf( full, "%s/%s", cwd, file );
+               remove( full );
+               free( full );
+               free( cwd );
+               remove( "x264_2pass.log.temp" );
+       }
+
        return NULL;
 }