X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconsumer_avformat.c;h=c9420fa0afa2f81c09e05ff9cb18bb0e20457b68;hb=42eea21bf0c71036397cac39f19d537c9344081c;hp=65491eab3865bd4fd35ca8e4c6116f52ec1d52b5;hpb=5707adef397ff18ddd1a86b71d98dde9aab440a4;p=melted

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index 65491ea..c9420fa 100644
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -22,6 +22,7 @@
 // mlt Header files
 #include <framework/mlt_consumer.h>
 #include <framework/mlt_frame.h>
+#include <framework/mlt_profile.h>
 
 // System header files
 #include <stdio.h>
@@ -40,6 +41,11 @@
 #endif
 #include <opt.h>
 
+#if LIBAVUTIL_VERSION_INT < (50<<16)
+#define PIX_FMT_RGB32 PIX_FMT_RGBA32
+#define PIX_FMT_YUYV422 PIX_FMT_YUV422
+#endif
+
 //
 // This structure should be extended and made globally available in mlt
 //
@@ -174,6 +180,7 @@ mlt_consumer consumer_avformat_init( mlt_profile profile, char *arg )
 		
 		// Default to separate processing threads for producer and consumer with no frame dropping!
 		mlt_properties_set_int( properties, "real_time", -1 );
+		mlt_properties_set_int( properties, "prefill", 1 );
 
 		// Set up start/stop/terminated callbacks
 		this->start = consumer_start;
@@ -520,7 +527,8 @@ static AVStream *add_video_stream( mlt_consumer this, AVFormatContext *oc, int c
 		c->height = mlt_properties_get_int( properties, "height" );
 		c->time_base.num = mlt_properties_get_int( properties, "frame_rate_den" );
 		c->time_base.den = mlt_properties_get_int( properties, "frame_rate_num" );
-		st->time_base = c->time_base;
+		if ( st->time_base.den == 0 )
+			st->time_base = c->time_base;
 		c->pix_fmt = pix_fmt ? avcodec_get_pix_fmt( pix_fmt ) : PIX_FMT_YUV420P;
 
 		if ( mlt_properties_get( properties, "aspect" ) )
@@ -807,7 +815,7 @@ static void *consumer_thread( void *arg )
 
 	// Need two av pictures for converting
 	AVFrame *output = NULL;
-	AVFrame *input = alloc_picture( PIX_FMT_YUV422, width, height );
+	AVFrame *input = alloc_picture( PIX_FMT_YUYV422, width, height );
 
 	// For receiving images from an mlt_frame
 	uint8_t *image;
@@ -837,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" );
@@ -1099,17 +1107,17 @@ static void *consumer_thread( void *arg )
 
 						// Do the colour space conversion
 #ifdef SWSCALE
-						struct SwsContext *context = sws_getContext( width, height, PIX_FMT_YUV422,
+						struct SwsContext *context = sws_getContext( width, height, PIX_FMT_YUYV422,
 							width, height, video_st->codec->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
 						sws_scale( context, input->data, input->linesize, 0, height,
 							output->data, output->linesize);
 						sws_freeContext( context );
 #else
-						img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUV422, width, height );
+						img_convert( ( AVPicture * )output, video_st->codec->pix_fmt, ( AVPicture * )input, PIX_FMT_YUYV422, width, height );
 #endif
 
 						// Apply the alpha if applicable
-						if ( video_st->codec->pix_fmt == PIX_FMT_RGBA32 )
+						if ( video_st->codec->pix_fmt == PIX_FMT_RGB32 )
 						{
 							uint8_t *alpha = mlt_frame_get_alpha_mask( frame );
 							register int n;
@@ -1330,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 );