X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=263972b8744895c02b58baaaf4d32429c5914a1e;hb=a2ad063d360d76163e7b0fd70e718de851db2dc8;hp=5b69d5a4232c61b4b7a2eca082fcd42ae4054f66;hpb=1b297f4a16fb10ac5711817456dbc97ad57d9dbd;p=mlt

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index 5b69d5a4..263972b8 100644
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -1,6 +1,6 @@
 /*
  * producer_avformat.c -- avformat producer
- * Copyright (C) 2003-2009 Ushodaya Enterprises Limited
+ * Copyright (C) 2003-2012 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
  * Author: Dan Dennedy <dan@dennedy.org>
  * Much code borrowed from ffmpeg.c: Copyright (c) 2000-2003 Fabrice Bellard
@@ -34,17 +34,27 @@
 #ifdef SWSCALE
 #  include <libswscale/swscale.h>
 #endif
-#if LIBAVCODEC_VERSION_MAJOR > 52
-#include <libavutil/samplefmt.h>
-#elif (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+
+#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0)
+#  include <libavutil/samplefmt.h>
+#else
+#  define AV_SAMPLE_FMT_S16 SAMPLE_FMT_S16
+#  define AV_SAMPLE_FMT_S32 SAMPLE_FMT_S32
+#  define AV_SAMPLE_FMT_FLT SAMPLE_FMT_FLT
+#  if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
 const char *avcodec_get_sample_fmt_name(int sample_fmt);
+#  endif
 #endif
+
 #ifdef VDPAU
 #  include <libavcodec/vdpau.h>
 #endif
 #if (LIBAVUTIL_VERSION_INT > ((50<<16)+(7<<8)+0))
 #  include <libavutil/pixdesc.h>
 #endif
+#if (LIBAVUTIL_VERSION_INT >= ((51<<16)+(8<<8)+0))
+#  include <libavutil/dict.h>
+#endif
 
 // System header files
 #include <stdlib.h>
@@ -57,7 +67,7 @@ const char *avcodec_get_sample_fmt_name(int sample_fmt);
 #define PIX_FMT_YUYV422 PIX_FMT_YUV422
 #endif
 
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_MAJOR >= 53
 #include <libavutil/opt.h>
 #define CODEC_TYPE_VIDEO      AVMEDIA_TYPE_VIDEO
 #define CODEC_TYPE_AUDIO      AVMEDIA_TYPE_AUDIO
@@ -72,9 +82,6 @@ const char *avcodec_get_sample_fmt_name(int sample_fmt);
 #define MAX_AUDIO_STREAMS (10)
 #define MAX_VDPAU_SURFACES (10)
 
-void avformat_lock( );
-void avformat_unlock( );
-
 struct producer_avformat_s
 {
 	mlt_producer parent;
@@ -89,12 +96,11 @@ struct producer_avformat_s
 	mlt_position video_expected;
 	int audio_index;
 	int video_index;
-	double start_time;
-	int first_pts;
-	int last_position;
+	int64_t first_pts;
+	int64_t last_position;
 	int seekable;
-	int current_position;
-	int got_picture;
+	int64_t current_position;
+	mlt_position nonseek_position;
 	int top_field_first;
 	uint8_t *audio_buffer[ MAX_AUDIO_STREAMS ];
 	size_t audio_buffer_size[ MAX_AUDIO_STREAMS ];
@@ -114,6 +120,7 @@ struct producer_avformat_s
 	mlt_deque apackets;
 	mlt_deque vpackets;
 	pthread_mutex_t packets_mutex;
+	pthread_mutex_t open_mutex;
 #ifdef VDPAU
 	struct
 	{
@@ -126,6 +133,9 @@ struct producer_avformat_s
 		int ip_age[2];
 		int is_decoded;
 		uint8_t *buffer;
+
+		VdpDevice device;
+		VdpDecoder decoder;
 	} *vdpau;
 #endif
 };
@@ -133,7 +143,7 @@ typedef struct producer_avformat_s *producer_avformat;
 
 // Forward references.
 static int list_components( char* file );
-static int producer_open( producer_avformat self, mlt_profile profile, const char *URL );
+static int producer_open( producer_avformat self, mlt_profile profile, const char *URL, int take_lock );
 static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int index );
 static void producer_avformat_close( producer_avformat );
 static void producer_close( mlt_producer parent );
@@ -184,23 +194,29 @@ mlt_producer producer_avformat_init( mlt_profile profile, const char *service, c
 			if ( strcmp( service, "avformat-novalidate" ) )
 			{
 				// Open the file
-				if ( producer_open( self, profile, file ) != 0 )
+				if ( producer_open( self, profile, file, 1 ) != 0 )
 				{
 					// Clean up
 					mlt_producer_close( producer );
 					producer = NULL;
+					producer_avformat_close( self );
 				}
 				else if ( self->seekable )
 				{
 					// Close the file to release resources for large playlists - reopen later as needed
-					avformat_lock();
+#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
+					if ( self->audio_format )
+						avformat_close_input( &self->audio_format );
+					if ( self->video_format )
+						avformat_close_input( &self->video_format );
+#else
 					if ( self->audio_format )
 						av_close_input_file( self->audio_format );
-					self->audio_format = NULL;
 					if ( self->video_format )
 						av_close_input_file( self->video_format );
+#endif
+					self->audio_format = NULL;
 					self->video_format = NULL;
-					avformat_unlock();
 				}
 			}
 			if ( producer )
@@ -263,7 +279,11 @@ static mlt_properties find_default_streams( producer_avformat self )
 {
 	int i;
 	char key[200];
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(8<<8)+0)
+	AVDictionaryEntry *tag = NULL;
+#else
 	AVMetadataTag *tag = NULL;
+#endif
 	AVFormatContext *context = self->video_format;
 	mlt_properties meta_media = MLT_PRODUCER_PROPERTIES( self->parent );
 
@@ -308,11 +328,19 @@ static mlt_properties find_default_streams( producer_avformat self )
 				snprintf( key, sizeof(key), "meta.media.%d.stream.sample_aspect_ratio", i );
 				mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->sample_aspect_ratio ) );
 #endif
+				snprintf( key, sizeof(key), "meta.media.%d.codec.width", i );
+				mlt_properties_set_int( meta_media, key, codec_context->width );
+				snprintf( key, sizeof(key), "meta.media.%d.codec.height", i );
+				mlt_properties_set_int( meta_media, key, codec_context->height );
 				snprintf( key, sizeof(key), "meta.media.%d.codec.frame_rate", i );
 				mlt_properties_set_double( meta_media, key, (double) codec_context->time_base.den /
 										   ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num ) );
 				snprintf( key, sizeof(key), "meta.media.%d.codec.pix_fmt", i );
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(3<<8)+0)
+				mlt_properties_set( meta_media, key, av_get_pix_fmt_name( codec_context->pix_fmt ) );
+#else
 				mlt_properties_set( meta_media, key, avcodec_get_pix_fmt_name( codec_context->pix_fmt ) );
+#endif
 				snprintf( key, sizeof(key), "meta.media.%d.codec.sample_aspect_ratio", i );
 				mlt_properties_set_double( meta_media, key, av_q2d( codec_context->sample_aspect_ratio ) );
 #if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)
@@ -337,11 +365,13 @@ static mlt_properties find_default_streams( producer_avformat self )
 #endif
 				break;
 			case CODEC_TYPE_AUDIO:
+				if ( !codec_context->channels )
+					break;
 				// Use first audio stream
 				if ( self->audio_index < 0 )
 					self->audio_index = i;
 				mlt_properties_set( meta_media, key, "audio" );
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVUTIL_VERSION_INT >= ((50<<16)+(38<<8)+0)
 				snprintf( key, sizeof(key), "meta.media.%d.codec.sample_fmt", i );
 				mlt_properties_set( meta_media, key, av_get_sample_fmt_name( codec_context->sample_fmt ) );
 #elif (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
@@ -375,7 +405,11 @@ static mlt_properties find_default_streams( producer_avformat self )
 
 		// Read Metadata
 #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(31<<8)+0)
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(8<<8)+0)
+		while ( ( tag = av_dict_get( stream->metadata, "", tag, AV_DICT_IGNORE_SUFFIX ) ) )
+#else
 		while ( ( tag = av_metadata_get( stream->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX ) ) )
+#endif
 		{
 			if ( tag->value && strcmp( tag->value, "" ) && strcmp( tag->value, "und" ) )
 			{
@@ -386,7 +420,11 @@ static mlt_properties find_default_streams( producer_avformat self )
 #endif
 	}
 #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(31<<8)+0)
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(8<<8)+0)
+	while ( ( tag = av_dict_get( context->metadata, "", tag, AV_DICT_IGNORE_SUFFIX ) ) )
+#else
 	while ( ( tag = av_metadata_get( context->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX ) ) )
+#endif
 	{
 		if ( tag->value && strcmp( tag->value, "" ) && strcmp( tag->value, "und" ) )
 		{
@@ -541,16 +579,20 @@ static double get_aspect_ratio( mlt_properties properties, AVStream *stream, AVC
 	return aspect_ratio;
 }
 
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **format, AVDictionary **params )
+#else
 static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **format, AVFormatParameters *params )
+#endif
 {
 	if ( !URL ) return NULL;
 
-	const char *result = URL;
+	char *result = NULL;
 	char *protocol = strdup( URL );
 	char *url = strchr( protocol, ':' );
 
 	// Only if there is not a protocol specification that avformat can handle
-#if LIBAVFORMAT_VERSION_MAJOR > 52
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
 	if ( url && avio_check( URL, 0 ) < 0 )
 #else
 	if ( url && !url_exist( URL ) )
@@ -568,12 +610,19 @@ static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **fo
 
 		if ( *format )
 		{
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+			// support for legacy width and height parameters
+			char *width = NULL;
+			char *height = NULL;
+#else
 			// These are required by video4linux2 (defaults)
 			params->width = profile->width;
 			params->height = profile->height;
-			params->time_base= (AVRational){ profile->frame_rate_den, profile->frame_rate_num };
+			if ( !strstr( URL, "&frame_rate" ) )
+				params->time_base = (AVRational){ profile->frame_rate_den, profile->frame_rate_num };
 			params->channels = 2;
 			params->sample_rate = 48000;
+#endif
 
 			// Parse out params
 			url = strchr( url, '?' );
@@ -581,7 +630,10 @@ static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **fo
 			{
 				url[0] = 0;
 				char *name = strdup( ++url );
-				char *value = strchr( name, ':' );
+				char *value = strchr( name, '=' );
+				if ( !value )
+					// Also accept : as delimiter for backwards compatibility.
+					value = strchr( name, ':' );
 				if ( value )
 				{
 					value[0] = 0;
@@ -589,6 +641,20 @@ static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **fo
 					char *t = strchr( value, '&' );
 					if ( t )
 						t[0] = 0;
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+					// translate old parameters to new av_dict names
+					if ( !strcmp( name, "frame_rate" ) )
+						av_dict_set( params, "framerate", value, 0 );
+					else if ( !strcmp( name, "pix_fmt" ) )
+						av_dict_set( params, "pixel_format", value, 0 );
+					else if ( !strcmp( name, "width" ) )
+						width = strdup( value );
+					else if ( !strcmp( name, "height" ) )
+						height = strdup( value );
+					else
+						// generic demux/device option support
+						av_dict_set( params, name, value, 0 );
+#else
 					if ( !strcmp( name, "frame_rate" ) )
 						params->time_base.den = atoi( value );
 					else if ( !strcmp( name, "frame_rate_base" ) )
@@ -609,14 +675,34 @@ static char* parse_url( mlt_profile profile, const char* URL, AVInputFormat **fo
 						params->height = atoi( value );
 					else if ( !strcmp( name, "standard" ) )
 						params->standard = strdup( value );
+#endif
 				}
 				free( name );
 				url = strchr( url, '&' );
 			}
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+			// continued support for legacy width and height parameters
+			if ( width && height )
+			{
+				char *s = malloc( strlen( width ) + strlen( height ) + 2 );
+				strcpy( s, width );
+				strcat( s, "x");
+				strcat( s, height );
+				av_dict_set( params, "video_size", s, 0 );
+				free( s );
+			}
+			if ( width ) free( width );
+			if ( height ) free ( height );
+#endif
 		}
+		result = strdup( result );
+	}
+	else
+	{
+		result = strdup( URL );
 	}
 	free( protocol );
-	return strdup( result );
+	return result;
 }
 
 static int get_basic_info( producer_avformat self, mlt_profile profile, const char *filename )
@@ -655,17 +741,14 @@ static int get_basic_info( producer_avformat self, mlt_profile profile, const ch
 		}
 	}
 
-	if ( format->start_time != AV_NOPTS_VALUE )
-		self->start_time = format->start_time;
-
 	// Check if we're seekable
 	// avdevices are typically AVFMT_NOFILE and not seekable
 	self->seekable = !format->iformat || !( format->iformat->flags & AVFMT_NOFILE );
 	if ( format->pb )
 	{
 		// protocols can indicate if they support seeking
-#if LIBAVFORMAT_VERSION_MAJOR > 52
-		self->seekable = context->pb->seekable;
+#if LIBAVFORMAT_VERSION_MAJOR >= 53
+		self->seekable = format->pb->seekable;
 #else
 		URLContext *uc = url_fileno( format->pb );
 		if ( uc )
@@ -675,12 +758,18 @@ static int get_basic_info( producer_avformat self, mlt_profile profile, const ch
 	if ( self->seekable )
 	{
 		// Do a more rigourous test of seekable on a disposable context
-		self->seekable = av_seek_frame( format, -1, self->start_time, AVSEEK_FLAG_BACKWARD ) >= 0;
+		self->seekable = av_seek_frame( format, -1, format->start_time, AVSEEK_FLAG_BACKWARD ) >= 0;
 		mlt_properties_set_int( properties, "seekable", self->seekable );
 		self->dummy_context = format;
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+		self->video_format = NULL;
+		avformat_open_input( &self->video_format, filename, NULL, NULL );
+		avformat_find_stream_info( self->video_format, NULL );
+#else
 		av_open_input_file( &self->video_format, filename, NULL, 0, NULL );
+		av_find_stream_info( self->video_format );
+#endif
 		format = self->video_format;
-		av_find_stream_info( format );
 	}
 
 	// Fetch the width, height and aspect ratio
@@ -727,98 +816,131 @@ static int get_basic_info( producer_avformat self, mlt_profile profile, const ch
 /** Open the file.
 */
 
-static int producer_open( producer_avformat self, mlt_profile profile, const char *URL )
+static int producer_open( producer_avformat self, mlt_profile profile, const char *URL, int take_lock )
 {
 	// Return an error code (0 == no error)
 	int error = 0;
 	mlt_properties properties = MLT_PRODUCER_PROPERTIES( self->parent );
 
 	// Lock the service
-	pthread_mutex_init( &self->audio_mutex, NULL );
-	pthread_mutex_init( &self->video_mutex, NULL );
-	pthread_mutex_init( &self->packets_mutex, NULL );
+	if ( take_lock )
+	{
+		pthread_mutex_init( &self->audio_mutex, NULL );
+		pthread_mutex_init( &self->video_mutex, NULL );
+		pthread_mutex_init( &self->packets_mutex, NULL );
+		pthread_mutex_init( &self->open_mutex, NULL );
+		pthread_mutex_lock( &self->audio_mutex );
+		pthread_mutex_lock( &self->video_mutex );
+	}
 	mlt_events_block( properties, self->parent );
-	pthread_mutex_lock( &self->audio_mutex );
-	pthread_mutex_lock( &self->video_mutex );
 
 	// Parse URL
 	AVInputFormat *format = NULL;
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+	AVDictionary *params = NULL;
+#else
 	AVFormatParameters params;
 	memset( &params, 0, sizeof(params) );
+#endif
 	char *filename = parse_url( profile, URL, &format, &params );
 
 	// Now attempt to open the file or device with filename
-#if LIBAVFORMAT_VERSION_MAJOR > 52
-	self->video_format->flags |= AVFMT_FLAG_PRIV_OPT;
-#endif
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+	error = avformat_open_input( &self->video_format, filename, format, &params ) < 0;
+	if ( error )
+		// If the URL is a network stream URL, then we probably need to open with full URL
+		error = avformat_open_input( &self->video_format, URL, format, &params ) < 0;
+#else
 	error = av_open_input_file( &self->video_format, filename, format, 0, &params ) < 0;
 	if ( error )
 		// If the URL is a network stream URL, then we probably need to open with full URL
 		error = av_open_input_file( &self->video_format, URL, format, 0, &params ) < 0;
+#endif
 
 	// Set MLT properties onto video AVFormatContext
-	apply_properties( self->video_format, properties, AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVFORMAT_VERSION_MAJOR > 52
-	if ( self->video_format->iformat && self->video_format->iformat->priv_class && self->video_format->priv_data )
-		apply_properties( self->video_format->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
-	av_demuxer_open( self->video_format, &params );
+	if ( !error && self->video_format )
+	{
+		apply_properties( self->video_format, properties, AV_OPT_FLAG_DECODING_PARAM );
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(110<<8)+0)
+		if ( self->video_format->iformat && self->video_format->iformat->priv_class && self->video_format->priv_data )
+			apply_properties( self->video_format->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
 #endif
+	}
 
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+	av_dict_free( &params );
+#else
 	// Cleanup AVFormatParameters
 	if ( params.standard )
 		free( (void*) params.standard );
+#endif
 
 	// If successful, then try to get additional info
-	if ( !error )
+	if ( !error && self->video_format )
 	{
 		// Get the stream info
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+		error = avformat_find_stream_info( self->video_format, NULL ) < 0;
+#else
 		error = av_find_stream_info( self->video_format ) < 0;
+#endif
 
 		// Continue if no error
-		if ( !error )
+		if ( !error && self->video_format )
 		{
 			// Find default audio and video streams
 			find_default_streams( self );
 			error = get_basic_info( self, profile, filename );
 
 			// Initialize position info
-			self->first_pts = -1;
+			self->first_pts = AV_NOPTS_VALUE;
 			self->last_position = POSITION_INITIAL;
 
-			// We're going to cheat here - for seekable A/V files, we will have separate contexts
-			// to support independent seeking of audio from video.
-			// TODO: Is this really necessary?
-			if ( self->audio_index != -1 && self->video_index != -1 )
+			if ( !self->audio_format )
 			{
-				if ( self->seekable )
+				// We're going to cheat here - for seekable A/V files, we will have separate contexts
+				// to support independent seeking of audio from video.
+				// TODO: Is this really necessary?
+				if ( self->audio_index != -1 && self->video_index != -1 )
 				{
-					// And open again for our audio context
-					av_open_input_file( &self->audio_format, filename, NULL, 0, NULL );
-					apply_properties( self->audio_format, properties, AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVFORMAT_VERSION_MAJOR > 52
-					if ( self->audio_format->iformat && self->audio_format->iformat->priv_class && self->audio_format->priv_data )
-						apply_properties( self->audio_format->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
-#endif
-					av_find_stream_info( self->audio_format );
+					if ( self->seekable )
+					{
+						// And open again for our audio context
+#if LIBAVFORMAT_VERSION_INT > ((53<<16)+(6<<8)+0)
+						avformat_open_input( &self->audio_format, filename, NULL, NULL );
+						apply_properties( self->audio_format, properties, AV_OPT_FLAG_DECODING_PARAM );
+						if ( self->audio_format->iformat && self->audio_format->iformat->priv_class && self->audio_format->priv_data )
+							apply_properties( self->audio_format->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
+						avformat_find_stream_info( self->audio_format, NULL );
+#else
+						av_open_input_file( &self->audio_format, filename, NULL, 0, NULL );
+						apply_properties( self->audio_format, properties, AV_OPT_FLAG_DECODING_PARAM );
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(110<<8)+0)
+                        if ( self->audio_format->iformat && self->audio_format->iformat->priv_class && self->audio_format->priv_data )
+                            apply_properties( self->audio_format->priv_data, properties, AV_OPT_FLAG_DECODING_PARAM );
+#endif
+						av_find_stream_info( self->audio_format );
+#endif
+					}
+					else
+					{
+						self->audio_format = self->video_format;
+					}
 				}
-				else
+				else if ( self->audio_index != -1 )
 				{
+					// We only have an audio context
 					self->audio_format = self->video_format;
+					self->video_format = NULL;
 				}
+				else if ( self->video_index == -1 )
+				{
+					// Something has gone wrong
+					error = -1;
+				}
+				if ( self->audio_format && !self->audio_streams )
+					get_audio_streams_info( self );
 			}
-			else if ( self->audio_index != -1 )
-			{
-				// We only have an audio context
-				self->audio_format = self->video_format;
-				self->video_format = NULL;
-			}
-			else if ( self->video_index == -1 )
-			{
-				// Something has gone wrong
-				error = -1;
-			}
-			if ( self->audio_format && !self->audio_streams )
-				get_audio_streams_info( self );
 		}
 	}
 	if ( filename )
@@ -831,13 +953,22 @@ static int producer_open( producer_avformat self, mlt_profile profile, const cha
 
 	if ( self->dummy_context )
 	{
+		pthread_mutex_lock( &self->open_mutex );
+#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
+		avformat_close_input( &self->dummy_context );
+#else
 		av_close_input_file( self->dummy_context );
+#endif
 		self->dummy_context = NULL;
+		pthread_mutex_unlock( &self->open_mutex );
 	}
 
 	// Unlock the service
-	pthread_mutex_unlock( &self->audio_mutex );
-	pthread_mutex_unlock( &self->video_mutex );
+	if ( take_lock )
+	{
+		pthread_mutex_unlock( &self->audio_mutex );
+		pthread_mutex_unlock( &self->video_mutex );
+	}
 	mlt_events_unblock( properties, self->parent );
 
 	return error;
@@ -848,30 +979,31 @@ static void reopen_video( producer_avformat self, mlt_producer producer )
 	mlt_properties properties = MLT_PRODUCER_PROPERTIES( producer );
 	mlt_service_lock( MLT_PRODUCER_SERVICE( producer ) );
 	pthread_mutex_lock( &self->audio_mutex );
+	pthread_mutex_lock( &self->open_mutex );
 
 	if ( self->video_codec )
-	{
-		avformat_lock();
 		avcodec_close( self->video_codec );
-		avformat_unlock();
-	}
 	self->video_codec = NULL;
+#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
+	if ( self->dummy_context )
+		avformat_close_input( &self->dummy_context );
+	if ( self->video_format )
+		avformat_close_input( &self->video_format );
+#else
 	if ( self->dummy_context )
 		av_close_input_file( self->dummy_context );
-	self->dummy_context = NULL;
 	if ( self->video_format )
 		av_close_input_file( self->video_format );
+#endif
+	self->dummy_context = NULL;
 	self->video_format = NULL;
+	pthread_mutex_unlock( &self->open_mutex );
 
 	int audio_index = self->audio_index;
 	int video_index = self->video_index;
 
-	pthread_mutex_unlock( &self->audio_mutex );
-	pthread_mutex_unlock( &self->video_mutex );
 	producer_open( self, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
-		mlt_properties_get( properties, "resource" ) );
-	pthread_mutex_lock( &self->video_mutex );
-	pthread_mutex_lock( &self->audio_mutex );
+		mlt_properties_get( properties, "resource" ), 0 );
 
 	self->audio_index = audio_index;
 	if ( self->video_format && video_index > -1 )
@@ -885,7 +1017,7 @@ static void reopen_video( producer_avformat self, mlt_producer producer )
 }
 
 static int seek_video( producer_avformat self, mlt_position position,
-	int req_position, int must_decode, int use_new_seek, int *ignore )
+	int64_t req_position, int preseek, int use_pts )
 {
 	mlt_producer producer = self->parent;
 	int paused = 0;
@@ -907,75 +1039,61 @@ static int seek_video( producer_avformat self, mlt_position position,
 		double source_fps = mlt_properties_get_double( properties, "meta.media.frame_rate_num" ) /
 			mlt_properties_get_double( properties, "meta.media.frame_rate_den" );
 
-		if ( self->av_frame && position + 1 == self->video_expected )
+		// find initial PTS
+		if ( self->last_position == POSITION_INITIAL )
 		{
-			// We're paused - use last image
-			paused = 1;
-		}
-		else if ( !self->seekable && position > self->video_expected && ( position - self->video_expected ) < 250 )
-		{
-			// Fast forward - seeking is inefficient for small distances - just ignore following frames
-			*ignore = ( int )( ( position - self->video_expected ) / mlt_producer_get_fps( producer ) * source_fps );
-			codec_context->skip_loop_filter = AVDISCARD_NONREF;
-		}
-		else if ( self->seekable && ( position < self->video_expected || position - self->video_expected >= 12 || self->last_position < 0 ) )
-		{
-			if ( use_new_seek && self->last_position == POSITION_INITIAL )
-			{
-				// find first key frame
-				int ret = 0;
-				int toscan = 100;
-				AVPacket pkt;
+			int ret = 0;
+			int toscan = 100;
+			AVPacket pkt;
 
-				while ( ret >= 0 && toscan-- > 0 )
+			while ( ret >= 0 && toscan-- > 0 )
+			{
+				ret = av_read_frame( context, &pkt );
+				if ( ret >= 0 && pkt.stream_index == self->video_index )
 				{
-					ret = av_read_frame( context, &pkt );
-					if ( ret >= 0 && ( pkt.flags & PKT_FLAG_KEY ) && pkt.stream_index == self->video_index )
-					{
-						mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "first_pts %"PRId64" dts %"PRId64" pts_dts_delta %d\n", pkt.pts, pkt.dts, (int)(pkt.pts - pkt.dts) );
-						self->first_pts = pkt.pts;
+					mlt_log_debug( MLT_PRODUCER_SERVICE(producer),
+						"first_pts %"PRId64" dts %"PRId64" pts_dts_delta %d\n",
+						pkt.pts, pkt.dts, (int)(pkt.pts - pkt.dts) );
+					self->first_pts = use_pts? pkt.pts : pkt.dts;
+					if ( self->first_pts != AV_NOPTS_VALUE )
 						toscan = 0;
-					}
-					av_free_packet( &pkt );
 				}
-				// Rewind
-				av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
+				av_free_packet( &pkt );
 			}
+			av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
+		}
 
+		if ( self->av_frame && position + 1 == self->video_expected )
+		{
+			// We're paused - use last image
+			paused = 1;
+		}
+		else if ( self->seekable && ( position < self->video_expected || position - self->video_expected >= 12 || self->last_position < 0 ) )
+		{
 			// Calculate the timestamp for the requested frame
-			int64_t timestamp;
-			if ( use_new_seek )
-			{
-				timestamp = ( req_position - 0.1 / source_fps ) /
-					( av_q2d( stream->time_base ) * source_fps );
-				mlt_log_verbose( MLT_PRODUCER_SERVICE(producer), "pos %d pts %"PRId64" ", req_position, timestamp );
-				if ( self->first_pts > 0 )
-					timestamp += self->first_pts;
-				else if ( context->start_time != AV_NOPTS_VALUE )
-					timestamp += context->start_time;
-			}
-			else
-			{
-				timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE + 0.5 );
-				if ( context->start_time != AV_NOPTS_VALUE )
-					timestamp += context->start_time;
-			}
-			if ( must_decode )
-				timestamp -= AV_TIME_BASE;
+			int64_t timestamp = req_position / ( av_q2d( stream->time_base ) * source_fps );
+			if ( req_position <= 0 )
+				timestamp = 0;
+			else if ( self->first_pts != AV_NOPTS_VALUE )
+				timestamp += self->first_pts;
+			else if ( context->start_time != AV_NOPTS_VALUE )
+				timestamp += context->start_time;
+			if ( preseek && av_q2d( stream->time_base ) != 0 )
+				timestamp -= 2 / av_q2d( stream->time_base );
 			if ( timestamp < 0 )
 				timestamp = 0;
-			mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "seeking timestamp %"PRId64" position %d expected %d last_pos %d\n",
+			mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "seeking timestamp %"PRId64" position %d expected %d last_pos %"PRId64"\n",
 				timestamp, position, self->video_expected, self->last_position );
 
 			// Seek to the timestamp
-			if ( use_new_seek )
+			// NOTE: reopen_video is disabled at this time because it is causing trouble with A/V sync.
+			if ( 1 || use_pts || req_position > 0 || self->last_position <= 0 )
 			{
 				codec_context->skip_loop_filter = AVDISCARD_NONREF;
 				av_seek_frame( context, self->video_index, timestamp, AVSEEK_FLAG_BACKWARD );
-			}
-			else if ( req_position > 0 || self->last_position <= 0 )
-			{
-				av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD );
+
+				// flush any pictures still in decode buffer
+				avcodec_flush_buffers( codec_context );
 			}
 			else
 			{
@@ -989,12 +1107,6 @@ static int seek_video( producer_avformat self, mlt_position position,
 			self->current_position = POSITION_INVALID;
 			self->last_position = POSITION_INVALID;
 			av_freep( &self->av_frame );
-
-			if ( use_new_seek )
-			{
-				// flush any pictures still in decode buffer
-				avcodec_flush_buffers( codec_context );
-			}
 		}
 	}
 	return paused;
@@ -1026,8 +1138,12 @@ static void get_audio_streams_info( producer_avformat self )
 			AVCodec *codec = avcodec_find_decoder( codec_context->codec_id );
 
 			// If we don't have a codec and we can't initialise it, we can't do much more...
-			avformat_lock( );
+			pthread_mutex_lock( &self->open_mutex );
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
+			if ( codec && avcodec_open2( codec_context, codec, NULL ) >= 0 )
+#else
 			if ( codec && avcodec_open( codec_context, codec ) >= 0 )
+#endif
 			{
 				self->audio_streams++;
 				self->audio_max_stream = i;
@@ -1038,7 +1154,7 @@ static void get_audio_streams_info( producer_avformat self )
 					self->max_frequency = codec_context->sample_rate;
 				avcodec_close( codec_context );
 			}
-			avformat_unlock( );
+			pthread_mutex_unlock( &self->open_mutex );
 		}
 	}
 	mlt_log_verbose( NULL, "[producer avformat] audio: total_streams %d max_stream %d total_channels %d max_channels %d\n",
@@ -1086,12 +1202,38 @@ static void set_luma_transfer( struct SwsContext *context, int colorspace, int u
 #endif
 }
 
-static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
-	mlt_image_format *format, int width, int height, int colorspace )
+static mlt_image_format pick_format( enum PixelFormat pix_fmt )
+{
+	switch ( pix_fmt )
+	{
+	case PIX_FMT_ARGB:
+	case PIX_FMT_RGBA:
+	case PIX_FMT_ABGR:
+	case PIX_FMT_BGRA:
+		return mlt_image_rgb24a;
+	case PIX_FMT_YUV420P:
+	case PIX_FMT_YUVJ420P:
+	case PIX_FMT_YUVA420P:
+		return mlt_image_yuv420p;
+	case PIX_FMT_RGB24:
+	case PIX_FMT_BGR24:
+	case PIX_FMT_GRAY8:
+	case PIX_FMT_MONOWHITE:
+	case PIX_FMT_MONOBLACK:
+	case PIX_FMT_RGB8:
+	case PIX_FMT_BGR8:
+		return mlt_image_rgb24;
+	default:
+		return mlt_image_yuv422;
+	}
+}
+
+static void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
+	mlt_image_format *format, int width, int height, int colorspace, uint8_t **alpha )
 {
 #ifdef SWSCALE
 	int full_range = -1;
-	int flags = SWS_BILINEAR | SWS_ACCURATE_RND;
+	int flags = SWS_BICUBIC | SWS_ACCURATE_RND;
 
 #ifdef USE_MMX
 	flags |= SWS_CPU_CAPS_MMX;
@@ -1100,19 +1242,26 @@ static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
 	flags |= SWS_CPU_CAPS_MMX2;
 #endif
 
-	if ( pix_fmt == PIX_FMT_RGB32 )
+	// extract alpha from planar formats
+	if ( ( pix_fmt == PIX_FMT_YUVA420P
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(35<<8)+101)
+			|| pix_fmt == PIX_FMT_YUVA444P
+#endif
+			) &&
+		*format != mlt_image_rgb24a && *format != mlt_image_opengl &&
+		frame->data[3] && frame->linesize[3] )
 	{
-		*format = mlt_image_rgb24a;
-		struct SwsContext *context = sws_getContext( width, height, pix_fmt,
-			width, height, PIX_FMT_RGBA, flags, NULL, NULL, NULL);
-		AVPicture output;
-		avpicture_fill( &output, buffer, PIX_FMT_RGBA, width, height );
-		set_luma_transfer( context, colorspace, full_range );
-		sws_scale( context, (const uint8_t* const*) frame->data, frame->linesize, 0, height,
-			output.data, output.linesize);
-		sws_freeContext( context );
+		int i;
+		uint8_t *src, *dst;
+
+		dst = *alpha = mlt_pool_alloc( width * height );
+		src = frame->data[3];
+
+		for ( i = 0; i < height; dst += width, src += frame->linesize[3], i++ )
+			memcpy( dst, src, FFMIN( width, frame->linesize[3] ) );
 	}
-	else if ( *format == mlt_image_yuv420p )
+
+	if ( *format == mlt_image_yuv420p )
 	{
 		struct SwsContext *context = sws_getContext( width, height, pix_fmt,
 			width, height, PIX_FMT_YUV420P, flags, NULL, NULL, NULL);
@@ -1203,16 +1352,9 @@ static int allocate_buffer( mlt_frame frame, AVCodecContext *codec_context, uint
 
 	if ( codec_context->width == 0 || codec_context->height == 0 )
 		return size;
-
 	*width = codec_context->width;
 	*height = codec_context->height;
-
-	if ( codec_context->pix_fmt == PIX_FMT_RGB32 )
-		size = *width * ( *height + 1 ) * 4;
-	else
-		size = mlt_image_format_size( *format, *width, *height, NULL );
-
-	// Construct the output image
+	size = mlt_image_format_size( *format, *width, *height, NULL );
 	*buffer = mlt_pool_alloc( size );
 	if ( *buffer )
 		mlt_frame_set_image( frame, *buffer, size, mlt_pool_release );
@@ -1251,15 +1393,31 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	// Get codec context
 	AVCodecContext *codec_context = stream->codec;
 
+	uint8_t *alpha = NULL;
+	int got_picture = 0;
+	int image_size = 0;
+
 	// Get the image cache
 	if ( ! self->image_cache && ! mlt_properties_get_int( properties, "noimagecache" ) )
+	{
 		self->image_cache = mlt_cache_init();
+	}
 	if ( self->image_cache )
 	{
-		mlt_cache_item item = mlt_cache_get( self->image_cache, (void*) position );
-		uint8_t *original = mlt_cache_item_data( item, (int*) format );
+		mlt_frame original = mlt_cache_get_frame( self->image_cache, mlt_frame_get_position( frame ) );
 		if ( original )
 		{
+			mlt_properties orig_props = MLT_FRAME_PROPERTIES( original );
+			int size = 0;
+
+			*buffer = mlt_properties_get_data( orig_props, "alpha", &size );
+			if (*buffer)
+				mlt_frame_set_alpha( frame, *buffer, size, NULL );
+			*buffer = mlt_properties_get_data( orig_props, "image", &size );
+			mlt_frame_set_image( frame, *buffer, size, NULL );
+			mlt_properties_set_data( frame_properties, "avformat.image_cache", original, 0, (mlt_destructor) mlt_frame_close, NULL );
+			*format = mlt_properties_get_int( orig_props, "format" );
+
 			// Set the resolution
 			*width = codec_context->width;
 			*height = codec_context->height;
@@ -1268,68 +1426,61 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 			if ( *height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
 				*height = 1080;
 
-			// Cache hit
-			int size = mlt_image_format_size( *format, *width, *height, NULL );
-			if ( writable )
-			{
-				*buffer = mlt_pool_alloc( size );
-				mlt_frame_set_image( frame, *buffer, size, mlt_pool_release );
-				memcpy( *buffer, original, size );
-				mlt_cache_item_close( item );
-			}
-			else
-			{
-				*buffer = original;
-				mlt_properties_set_data( frame_properties, "avformat.image_cache", item, 0, ( mlt_destructor )mlt_cache_item_close, NULL );
-				mlt_frame_set_image( frame, *buffer, size, NULL );
-			}
-			self->got_picture = 1;
-
+			got_picture = 1;
 			goto exit_get_image;
 		}
 	}
 	// Cache miss
-	int image_size = 0;
 
 	// Packet
 	AVPacket pkt;
 
-	// Special case ffwd handling
-	int ignore = 0;
-
 	// We may want to use the source fps if available
 	double source_fps = mlt_properties_get_double( properties, "meta.media.frame_rate_num" ) /
 		mlt_properties_get_double( properties, "meta.media.frame_rate_den" );
 
 	// This is the physical frame position in the source
-	int req_position = ( int )( position / mlt_producer_get_fps( producer ) * source_fps + 0.5 );
+	int64_t req_position = ( int64_t )( position / mlt_producer_get_fps( producer ) * source_fps + 0.5 );
 
 	// Determines if we have to decode all frames in a sequence
 	// Temporary hack to improve intra frame only
-	int must_decode = strcmp( codec_context->codec->name, "dnxhd" ) &&
+	int must_decode = !( codec_context->codec && codec_context->codec->name ) || (
+				  strcmp( codec_context->codec->name, "dnxhd" ) &&
 				  strcmp( codec_context->codec->name, "dvvideo" ) &&
 				  strcmp( codec_context->codec->name, "huffyuv" ) &&
 				  strcmp( codec_context->codec->name, "mjpeg" ) &&
-				  strcmp( codec_context->codec->name, "rawvideo" );
+				  strcmp( codec_context->codec->name, "rawvideo" ) );
 
 	// Turn on usage of new seek API and PTS for seeking
-	int use_new_seek = codec_context->codec_id == CODEC_ID_H264 && !strcmp( context->iformat->name, "mpegts" );
-	if ( mlt_properties_get( properties, "new_seek" ) )
-		use_new_seek = mlt_properties_get_int( properties, "new_seek" );
+	int use_pts = self->seekable &&
+		codec_context->codec_id == CODEC_ID_H264 && codec_context->has_b_frames;
+	if ( mlt_properties_get( properties, "use_pts" ) )
+		use_pts = mlt_properties_get_int( properties, "use_pts" );
+	double delay = mlt_properties_get_double( properties, "video_delay" );
 
 	// Seek if necessary
-	int paused = seek_video( self, position, req_position, must_decode, use_new_seek, &ignore );
+	const char *interp = mlt_properties_get( frame_properties, "rescale.interp" );
+	int preseek = must_decode
+#if defined(FFUDIV) && LIBAVFORMAT_VERSION_INT >= ((53<<16)+(24<<8)+2)
+		&& ( !use_pts || ( interp && strcmp( interp, "nearest" ) ) )
+#endif
+		&& codec_context->has_b_frames;
+	int paused = seek_video( self, position, req_position, preseek, use_pts );
 
 	// Seek might have reopened the file
 	context = self->video_format;
 	stream = context->streams[ self->video_index ];
 	codec_context = stream->codec;
+	if ( *format == mlt_image_none ||
+			codec_context->pix_fmt == PIX_FMT_ARGB ||
+			codec_context->pix_fmt == PIX_FMT_RGBA ||
+			codec_context->pix_fmt == PIX_FMT_ABGR ||
+			codec_context->pix_fmt == PIX_FMT_BGRA )
+		*format = pick_format( codec_context->pix_fmt );
 
 	// Duplicate the last image if necessary
-	if ( self->av_frame && self->av_frame->linesize[0] && self->got_picture && self->seekable
-		 && ( paused
-			  || self->current_position == req_position
-			  || ( !use_new_seek && self->current_position > req_position ) ) )
+	if ( self->av_frame && self->av_frame->linesize[0]
+		 && ( paused || self->current_position >= req_position ) )
 	{
 		// Duplicate it
 		if ( ( image_size = allocate_buffer( frame, codec_context, buffer, format, width, height ) ) )
@@ -1348,22 +1499,20 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 				picture.linesize[1] = codec_context->width / 2;
 				picture.linesize[2] = codec_context->width / 2;
 				convert_image( (AVFrame*) &picture, *buffer,
-					PIX_FMT_YUV420P, format, *width, *height, self->colorspace );
+					PIX_FMT_YUV420P, format, *width, *height, self->colorspace, &alpha );
 			}
 			else
 #endif
 			convert_image( self->av_frame, *buffer, codec_context->pix_fmt,
-				format, *width, *height, self->colorspace );
+				format, *width, *height, self->colorspace, &alpha );
+			got_picture = 1;
 		}
-		else
-			mlt_frame_get_image( frame, buffer, format, width, height, writable );
 	}
 	else
 	{
 		int ret = 0;
-		int int_position = 0;
+		int64_t int_position = 0;
 		int decode_errors = 0;
-		int got_picture = 0;
 
 		av_init_packet( &pkt );
 
@@ -1400,54 +1549,42 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 			if ( ret >= 0 && pkt.stream_index == self->video_index && pkt.size > 0 )
 			{
 				// Determine time code of the packet
-				if ( use_new_seek )
+				if ( use_pts && pkt.pts == AV_NOPTS_VALUE )
 				{
-					int64_t pts = pkt.pts;
-					if ( self->first_pts > 0 )
-						pts -= self->first_pts;
-					else if ( context->start_time != AV_NOPTS_VALUE )
-						pts -= context->start_time;
-					int_position = ( int )( av_q2d( stream->time_base ) * pts * source_fps + 0.1 );
-					if ( pkt.pts == AV_NOPTS_VALUE )
-					{
-						self->invalid_pts_counter++;
-						if ( self->invalid_pts_counter > 20 )
-						{
-							mlt_log_panic( MLT_PRODUCER_SERVICE(producer), "\ainvalid PTS; DISABLING NEW_SEEK!\n" );
-							mlt_properties_set_int( properties, "new_seek", 0 );
-							int_position = req_position;
-							use_new_seek = 0;
-						}
-					}
-					else
+					self->invalid_pts_counter++;
+					if ( self->invalid_pts_counter > 20 )
 					{
-						self->invalid_pts_counter = 0;
+						mlt_log_warning( MLT_PRODUCER_SERVICE(producer), "PTS invalid; using DTS instead\n" );
+						mlt_properties_set_int( properties, "use_pts", 0 );
+						use_pts = 0;
 					}
-					mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.pts %"PRId64" req_pos %d cur_pos %d pkt_pos %d\n",
-						pkt.pts, req_position, self->current_position, int_position );
 				}
 				else
 				{
-					if ( self->seekable && pkt.dts != AV_NOPTS_VALUE )
-					{
-						int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps + 0.5 );
-						if ( context->start_time != AV_NOPTS_VALUE )
-							int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE + 0.5 );
-						if ( int_position == self->last_position )
-							int_position = self->last_position + 1;
-					}
-					else
-					{
-						int_position = req_position;
-					}
-					mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "pkt.dts %"PRId64" req_pos %d cur_pos %d pkt_pos %d\n",
-						pkt.dts, req_position, self->current_position, int_position );
-					// Make a dumb assumption on streams that contain wild timestamps
-					if ( abs( req_position - int_position ) > 999 )
-					{
-						int_position = req_position;
-						mlt_log_debug( MLT_PRODUCER_SERVICE(producer), " WILD TIMESTAMP!" );
-					}
+					self->invalid_pts_counter = 0;
+				}
+				int64_t pts = ( use_pts && pkt.pts != AV_NOPTS_VALUE )? pkt.pts : pkt.dts;
+				if ( pts != AV_NOPTS_VALUE )
+				{
+					if ( !self->seekable && self->first_pts == AV_NOPTS_VALUE )
+						self->first_pts = pts;
+					if ( self->first_pts != AV_NOPTS_VALUE )
+						pts -= self->first_pts;
+					else if ( context->start_time != AV_NOPTS_VALUE )
+						pts -= context->start_time;
+					int_position = ( int64_t )( ( av_q2d( stream->time_base ) * pts + delay ) * source_fps + 0.5 );
+					if ( int_position == self->last_position )
+						int_position = self->last_position + 1;
+				}
+				mlt_log_debug( MLT_PRODUCER_SERVICE(producer),
+					"V pkt.pts %"PRId64" pkt.dts %"PRId64" req_pos %"PRId64" cur_pos %"PRId64" pkt_pos %"PRId64"\n",
+					pkt.pts, pkt.dts, req_position, self->current_position, int_position );
+
+				// Make a dumb assumption on streams that contain wild timestamps
+				if ( abs( req_position - int_position ) > 999 )
+				{
+					int_position = req_position;
+					mlt_log_warning( MLT_PRODUCER_SERVICE(producer), " WILD TIMESTAMP!\n" );
 				}
 				self->last_position = int_position;
 
@@ -1455,18 +1592,16 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 				if ( must_decode || int_position >= req_position )
 				{
 #ifdef VDPAU
-					if ( g_vdpau && self->vdpau )
+					if ( self->vdpau )
 					{
-						if ( g_vdpau->producer != self )
+						if ( self->vdpau->decoder == VDP_INVALID_HANDLE )
 						{
-							vdpau_decoder_close();
 							vdpau_decoder_init( self );
 						}
-						if ( self->vdpau )
-							self->vdpau->is_decoded = 0;
+						self->vdpau->is_decoded = 0;
 					}
 #endif
-					codec_context->reordered_opaque = pkt.pts;
+					codec_context->reordered_opaque = int_position;
 					if ( int_position >= req_position )
 						codec_context->skip_loop_filter = AVDISCARD_NONE;
 #if (LIBAVCODEC_VERSION_INT >= ((52<<16)+(26<<8)+0))
@@ -1488,32 +1623,14 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 
 				if ( got_picture )
 				{
-					if ( use_new_seek )
-					{
-						// Determine time code of the packet
-						int64_t pts = self->av_frame->reordered_opaque;
-						if ( self->first_pts > 0 )
-							pts -= self->first_pts;
-						else if ( context->start_time != AV_NOPTS_VALUE )
-							pts -= context->start_time;
-						int_position = ( int )( av_q2d( stream->time_base) * pts * source_fps + 0.1 );
-						mlt_log_debug( MLT_PRODUCER_SERVICE(producer), "got frame %d, key %d\n", int_position, self->av_frame->key_frame );
-					}
-					// Handle ignore
+					if ( use_pts )
+						// Get position of reordered frame
+						int_position = self->av_frame->reordered_opaque;
+
 					if ( int_position < req_position )
-					{
-						ignore = 0;
 						got_picture = 0;
-					}
 					else if ( int_position >= req_position )
-					{
-						ignore = 0;
 						codec_context->skip_loop_filter = AVDISCARD_NONE;
-					}
-					else if ( ignore -- )
-					{
-						got_picture = 0;
-					}
 				}
 				mlt_log_debug( MLT_PRODUCER_SERVICE(producer), " got_pic %d key %d\n", got_picture, pkt.flags & PKT_FLAG_KEY );
 			}
@@ -1549,7 +1666,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 							if ( status == VDP_STATUS_OK )
 							{
 								convert_image( self->av_frame, *buffer, PIX_FMT_YUV420P,
-									format, *width, *height, self->colorspace );
+									format, *width, *height, self->colorspace, &alpha );
 							}
 							else
 							{
@@ -1566,10 +1683,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 					else
 #endif
 					convert_image( self->av_frame, *buffer, codec_context->pix_fmt,
-						format, *width, *height, self->colorspace );
+						format, *width, *height, self->colorspace, &alpha );
 					self->top_field_first |= self->av_frame->top_field_first;
 					self->current_position = int_position;
-					self->got_picture = 1;
 				}
 				else
 				{
@@ -1581,15 +1697,20 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 		}
 	}
 
-	if ( self->got_picture && image_size > 0 && self->image_cache )
+	// set alpha
+	if ( alpha )
+		mlt_frame_set_alpha( frame, alpha, (*width) * (*height), mlt_pool_release );
+
+	if ( image_size > 0 && self->image_cache )
 	{
-		// Copy buffer to image cache	
-		uint8_t *image = mlt_pool_alloc( image_size );
-		memcpy( image, *buffer, image_size );
-		mlt_cache_put( self->image_cache, (void*) position, image, *format, mlt_pool_release );
+		mlt_properties_set_int( frame_properties, "format", *format );
+		mlt_cache_put_frame( self->image_cache, frame );
 	}
+
 	// Try to duplicate last image if there was a decoding failure
-	else if ( !image_size && self->av_frame && self->av_frame->linesize[0] )
+	// TODO: with multithread decoding a partial frame decoding resulting
+	// in failure also resets av_frame making test below fail.
+	if ( !image_size && self->av_frame && self->av_frame->linesize[0] )
 	{
 		// Duplicate it
 		if ( ( image_size = allocate_buffer( frame, codec_context, buffer, format, width, height ) ) )
@@ -1608,16 +1729,14 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 				picture.linesize[1] = codec_context->width / 2;
 				picture.linesize[2] = codec_context->width / 2;
 				convert_image( (AVFrame*) &picture, *buffer,
-					PIX_FMT_YUV420P, format, *width, *height, self->colorspace );
+					PIX_FMT_YUV420P, format, *width, *height, self->colorspace, &alpha );
 			}
 			else
 #endif
 			convert_image( self->av_frame, *buffer, codec_context->pix_fmt,
-				format, *width, *height, self->colorspace );
-			self->got_picture = 1;
+				format, *width, *height, self->colorspace, &alpha );
+			got_picture = 1;
 		}
-		else
-			mlt_frame_get_image( frame, buffer, format, width, height, writable );
 	}
 
 	// Regardless of speed, we expect to get the next frame (cos we ain't too bright)
@@ -1645,7 +1764,7 @@ exit_get_image:
 	mlt_properties_set_int( properties, "meta.media.progressive", mlt_properties_get_int( frame_properties, "progressive" ) );
 	mlt_service_unlock( MLT_PRODUCER_SERVICE( producer ) );
 
-	return !self->got_picture;
+	return !got_picture;
 }
 
 /** Process properties as AVOptions and apply to AV context obj
@@ -1658,11 +1777,17 @@ static void apply_properties( void *obj, mlt_properties properties, int flags )
 	for ( i = 0; i < count; i++ )
 	{
 		const char *opt_name = mlt_properties_get_name( properties, i );
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(10<<8)+0)
+		const AVOption *opt = av_opt_find( obj, opt_name, NULL, flags, flags );
+#else
 		const AVOption *opt = av_find_opt( obj, opt_name, NULL, flags, flags );
+#endif
 		if ( opt_name && mlt_properties_get( properties, opt_name ) )
 		{
 			if ( opt )
-#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(7<<8)+0)
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(12<<8)+0)
+				av_opt_set( obj, opt_name, mlt_properties_get( properties, opt_name), 0 );
+#elif 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 );
@@ -1698,7 +1823,7 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
 				{
 					self->video_codec = codec_context;
 					if ( !vdpau_decoder_init( self ) )
-						vdpau_decoder_close();
+						vdpau_fini( self );
 				}
 			}
 			if ( !self->vdpau )
@@ -1714,8 +1839,12 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
 			codec_context->thread_count = thread_count;
 
 		// If we don't have a codec and we can't initialise it, we can't do much more...
-		avformat_lock( );
+		pthread_mutex_lock( &self->open_mutex );
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
+		if ( codec && avcodec_open2( codec_context, codec, NULL ) >= 0 )
+#else
 		if ( codec && avcodec_open( codec_context, codec ) >= 0 )
+#endif
 		{
 			// Now store the codec with its destructor
 			self->video_codec = codec_context;
@@ -1724,14 +1853,14 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
 		{
 			// Remember that we can't use this later
 			self->video_index = -1;
-			avformat_unlock( );
+			pthread_mutex_unlock( &self->open_mutex );
 			return 0;
 		}
-		avformat_unlock( );
+		pthread_mutex_unlock( &self->open_mutex );
 
 		// Process properties as AVOptions
 		apply_properties( codec_context, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(122<<8)+0)
 		if ( codec->priv_class && codec_context->priv_data )
 			apply_properties( codec_context->priv_data, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
 #endif
@@ -1795,12 +1924,6 @@ static int video_codec_init( producer_avformat self, int index, mlt_properties p
 			}
 		}
 
-		// source_fps is deprecated in favor of meta.media.frame_rate_num and .frame_rate_den
-		if ( source_fps > 0 )
-			mlt_properties_set_double( properties, "source_fps", source_fps );
-		else
-			mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( self->parent ) );
-
 		// Set the YUV colorspace from override or detect
 		self->colorspace = mlt_properties_get_int( properties, "force_colorspace" );
 #if LIBAVCODEC_VERSION_INT > ((52<<16)+(28<<8)+0)		
@@ -1852,7 +1975,7 @@ static void producer_set_up_video( producer_avformat self, mlt_frame frame )
 	if ( !context && index > -1 )
 	{
 		producer_open( self, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
-			mlt_properties_get( properties, "resource" ) );
+			mlt_properties_get( properties, "resource" ), 1 );
 		context = self->video_format;
 	}
 
@@ -1877,13 +2000,11 @@ static void producer_set_up_video( producer_avformat self, mlt_frame frame )
 	{
 		// Reset the video properties if the index changed
 		self->video_index = index;
+		pthread_mutex_lock( &self->open_mutex );
 		if ( self->video_codec )
-		{
-			avformat_lock();
 			avcodec_close( self->video_codec );
-			avformat_unlock();
-		}
 		self->video_codec = NULL;
+		pthread_mutex_unlock( &self->open_mutex );
 	}
 
 	// Get the frame properties
@@ -1900,11 +2021,8 @@ static void producer_set_up_video( producer_avformat self, mlt_frame frame )
 		// Set the width and height
 		mlt_properties_set_int( frame_properties, "width", self->video_codec->width );
 		mlt_properties_set_int( frame_properties, "height", self->video_codec->height );
-		// real_width and real_height are deprecated in favor of meta.media.width and .height
 		mlt_properties_set_int( properties, "meta.media.width", self->video_codec->width );
 		mlt_properties_set_int( properties, "meta.media.height", self->video_codec->height );
-		mlt_properties_set_int( frame_properties, "real_width", self->video_codec->width );
-		mlt_properties_set_int( frame_properties, "real_height", self->video_codec->height );
 		mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
 		mlt_properties_set_int( frame_properties, "colorspace", self->colorspace );
 
@@ -1912,7 +2030,6 @@ static void producer_set_up_video( producer_avformat self, mlt_frame frame )
 		if ( self->video_codec->height == 1088 && mlt_profile_dar( mlt_service_profile( MLT_PRODUCER_SERVICE( producer ) ) ) == 16.0/9.0 )
 		{
 			mlt_properties_set_int( properties, "meta.media.height", 1080 );
-			mlt_properties_set_int( frame_properties, "real_height", 1080 );
 		}
 
 		// Add our image operation
@@ -1926,7 +2043,7 @@ static void producer_set_up_video( producer_avformat self, mlt_frame frame )
 	}
 }
 
-static int seek_audio( producer_avformat self, mlt_position position, double timecode, int *ignore )
+static int seek_audio( producer_avformat self, mlt_position position, double timecode )
 {
 	int paused = 0;
 
@@ -1938,11 +2055,6 @@ static int seek_audio( producer_avformat self, mlt_position position, double tim
 			// We're paused - silence required
 			paused = 1;
 		}
-		else if ( !self->seekable && position > self->audio_expected && ( position - self->audio_expected ) < 250 )
-		{
-			// Fast forward - seeking is inefficient for small distances - just ignore following frames
-			*ignore = position - self->audio_expected;
-		}
 		else if ( position < self->audio_expected || position - self->audio_expected >= 12 )
 		{
 			AVFormatContext *context = self->audio_format;
@@ -1967,7 +2079,9 @@ static int seek_audio( producer_avformat self, mlt_position position, double tim
 
 static int sample_bytes( AVCodecContext *context )
 {
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVUTIL_VERSION_INT >= ((51<<16)+(8<<8)+0)
+	return av_get_bytes_per_sample( context->sample_fmt );
+#elif LIBAVCODEC_VERSION_MAJOR >= 53
 	return av_get_bits_per_sample_fmt( context->sample_fmt ) / 8;
 #else
 	return av_get_bits_per_sample_format( context->sample_fmt ) / 8;
@@ -2047,10 +2161,10 @@ static int decode_audio( producer_avformat self, int *ignore, AVPacket pkt, int
 			}
 
 			// Handle ignore
-			while ( *ignore && audio_used > samples )
+			while ( *ignore && audio_used )
 			{
 				*ignore -= 1;
-				audio_used -= samples;
+				audio_used -= audio_used > samples ? samples : audio_used;
 				memmove( audio_buffer, &audio_buffer[ samples * (resample? channels : codec_context->channels) * sizeof_sample ],
 						 audio_used * sizeof_sample );
 			}
@@ -2058,22 +2172,30 @@ static int decode_audio( producer_avformat self, int *ignore, AVPacket pkt, int
 	}
 
 	// If we're behind, ignore this packet
-	if ( pkt.pts >= 0 )
-	{
-		double current_pts = av_q2d( context->streams[ index ]->time_base ) * pkt.pts;
-		int req_position = ( int )( timecode * fps + 0.5 );
-		int int_position = ( int )( current_pts * fps + 0.5 );
-		if ( context->start_time != AV_NOPTS_VALUE )
-			int_position -= ( int )( fps * context->start_time / AV_TIME_BASE + 0.5 );
-
-		if ( self->seekable && *ignore == 0 )
+	// Skip this on non-seekable, audio-only inputs.
+	if ( pkt.pts >= 0 && ( self->seekable || self->video_format ) && *ignore == 0 && audio_used > samples / 2 )
+	{
+		int64_t pts = pkt.pts;
+		if ( self->first_pts != 0 )
+			pts -= self->first_pts;
+		else if ( context->start_time != AV_NOPTS_VALUE )
+			pts -= context->start_time;
+		double timebase = av_q2d( context->streams[ index ]->time_base );
+		int64_t int_position = ( int64_t )( timebase * pts * fps + 0.5 );
+		int64_t req_position = ( int64_t )( timecode * fps + 0.5 );
+
+		mlt_log_debug( MLT_PRODUCER_SERVICE(self->parent),
+			"A pkt.pts %"PRId64" pkt.dts %"PRId64" req_pos %"PRId64" cur_pos %"PRId64" pkt_pos %"PRId64"\n",
+			pkt.pts, pkt.dts, req_position, self->current_position, int_position );
+
+		if ( int_position > 0 )
 		{
 			if ( int_position < req_position )
 				// We are behind, so skip some
-				*ignore = 1;
-			else if ( int_position > req_position + 2 )
+				*ignore = req_position - int_position;
+			else if ( self->audio_index != INT_MAX && int_position > req_position + 2 )
 				// We are ahead, so seek backwards some more
-				seek_audio( self, req_position, timecode - 1.0, ignore );
+				seek_audio( self, req_position, timecode - 1.0 );
 		}
 	}
 
@@ -2101,10 +2223,15 @@ static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format
 	double fps = mlt_producer_get_fps( self->parent );
 
 	// Number of frames to ignore (for ffwd)
-	int ignore = 0;
+	int ignore[ MAX_AUDIO_STREAMS ] = { 0 };
 
 	// Flag for paused (silence)
-	int paused = seek_audio( self, position, real_timecode, &ignore );
+	int paused = seek_audio( self, position, real_timecode );
+
+	// Initialize ignore for all streams from the seek return value
+	int i = MAX_AUDIO_STREAMS;
+	while ( i-- )
+		ignore[i] = ignore[0];
 
 	// Fetch the audio_format
 	AVFormatContext *context = self->audio_format;
@@ -2145,7 +2272,7 @@ static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format
 				self->audio_resample[ index ] = av_audio_resample_init(
 					self->audio_index == INT_MAX ? codec_context->channels : *channels,
 					codec_context->channels, *frequency, codec_context->sample_rate,
-					SAMPLE_FMT_S16, codec_context->sample_fmt, 16, 10, 0, 0.8 );
+					AV_SAMPLE_FMT_S16, codec_context->sample_fmt, 16, 10, 0, 0.8 );
 #else
 				self->audio_resample[ index ] = audio_resample_init(
 					self->audio_index == INT_MAX ? codec_context->channels : *channels,
@@ -2185,11 +2312,23 @@ static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format
 		while ( ret >= 0 && !got_audio )
 		{
 			// Check if the buffer already contains the samples required
-			if ( self->audio_index != INT_MAX && self->audio_used[ self->audio_index ] >= *samples && ignore == 0 )
+			if ( self->audio_index != INT_MAX &&
+				 self->audio_used[ self->audio_index ] >= *samples &&
+				 ignore[ self->audio_index ] == 0 )
 			{
 				got_audio = 1;
 				break;
 			}
+			else if ( self->audio_index == INT_MAX )
+			{
+				// Check if there is enough audio for all streams
+				got_audio = 1;
+				for ( index = 0; got_audio && index < context->nb_streams; index++ )
+					if ( ( self->audio_codec[ index ] && self->audio_used[ index ] < *samples ) || ignore[ index ] )
+						got_audio = 0;
+				if ( got_audio )
+					break;
+			}
 
 			// Read a packet
 			pthread_mutex_lock( &self->packets_mutex );
@@ -2221,22 +2360,12 @@ static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format
 			{
 				int channels2 = ( self->audio_index == INT_MAX || !self->audio_resample[index] ) ?
 					self->audio_codec[index]->channels : *channels;
-				ret = decode_audio( self, &ignore, pkt, channels2, *samples, real_timecode, fps );
+				ret = decode_audio( self, &ignore[index], pkt, channels2, *samples, real_timecode, fps );
 			}
 
 			if ( self->seekable || index != self->video_index )
 				av_free_packet( &pkt );
 
-			if ( self->audio_index == INT_MAX && ret >= 0 )
-			{
-				// Determine if there is enough audio for all streams
-				got_audio = 1;
-				for ( index = 0; index < context->nb_streams; index++ )
-				{
-					if ( self->audio_codec[ index ] && self->audio_used[ index ] < *samples )
-						got_audio = 0;
-				}
-			}
 		}
 
 		// Set some additional return values
@@ -2246,8 +2375,8 @@ static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format
 			index = self->audio_index;
 			*channels = self->audio_codec[ index ]->channels;
 			*frequency = self->audio_codec[ index ]->sample_rate;
-			*format = self->audio_codec[ index ]->sample_fmt == SAMPLE_FMT_S32 ? mlt_audio_s32le
-				: self->audio_codec[ index ]->sample_fmt == SAMPLE_FMT_FLT ? mlt_audio_f32le
+			*format = self->audio_codec[ index ]->sample_fmt == AV_SAMPLE_FMT_S32 ? mlt_audio_s32le
+				: self->audio_codec[ index ]->sample_fmt == AV_SAMPLE_FMT_FLT ? mlt_audio_f32le
 				: mlt_audio_s16;
 			sizeof_sample = sample_bytes( self->audio_codec[ index ] );
 		}
@@ -2257,8 +2386,8 @@ static int producer_get_audio( mlt_frame frame, void **buffer, mlt_audio_format
 			for ( index = 0; index < index_max; index++ )
 				if ( self->audio_codec[ index ] && !self->audio_resample[ index ] )
 				{
-					*format = self->audio_codec[ index ]->sample_fmt == SAMPLE_FMT_S32 ? mlt_audio_s32le
-						: self->audio_codec[ index ]->sample_fmt == SAMPLE_FMT_FLT ? mlt_audio_f32le
+					*format = self->audio_codec[ index ]->sample_fmt == AV_SAMPLE_FMT_S32 ? mlt_audio_s32le
+						: self->audio_codec[ index ]->sample_fmt == AV_SAMPLE_FMT_FLT ? mlt_audio_f32le
 						: mlt_audio_s16;
 					sizeof_sample = sample_bytes( self->audio_codec[ index ] );
 					break;
@@ -2351,8 +2480,12 @@ static int audio_codec_init( producer_avformat self, int index, mlt_properties p
 		AVCodec *codec = avcodec_find_decoder( codec_context->codec_id );
 
 		// If we don't have a codec and we can't initialise it, we can't do much more...
-		avformat_lock( );
+		pthread_mutex_lock( &self->open_mutex );
+#if LIBAVCODEC_VERSION_INT >= ((53<<16)+(8<<8)+0)
+		if ( codec && avcodec_open2( codec_context, codec, NULL ) >= 0 )
+#else
 		if ( codec && avcodec_open( codec_context, codec ) >= 0 )
+#endif
 		{
 			// Now store the codec with its destructor
 			if ( self->audio_codec[ index ] )
@@ -2364,11 +2497,11 @@ static int audio_codec_init( producer_avformat self, int index, mlt_properties p
 			// Remember that we can't use self later
 			self->audio_index = -1;
 		}
-		avformat_unlock( );
+		pthread_mutex_unlock( &self->open_mutex );
 
 		// Process properties as AVOptions
 		apply_properties( codec_context, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
-#if LIBAVCODEC_VERSION_MAJOR > 52
+#if LIBAVCODEC_VERSION_INT >= ((52<<16)+(122<<8)+0)
 		if ( codec && codec->priv_class && codec_context->priv_data )
 			apply_properties( codec_context->priv_data, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
 #endif
@@ -2405,7 +2538,7 @@ static void producer_set_up_audio( producer_avformat self, mlt_frame frame )
 	if ( !context && self->audio_index > -1 && index > -1 )
 	{
 		producer_open( self, mlt_service_profile( MLT_PRODUCER_SERVICE(producer) ),
-			mlt_properties_get( properties, "resource" ) );
+			mlt_properties_get( properties, "resource" ), 1 );
 		context = self->audio_format;
 	}
 
@@ -2427,13 +2560,11 @@ static void producer_set_up_audio( producer_avformat self, mlt_frame frame )
 	// Update the audio properties if the index changed
 	if ( context && index > -1 && index != self->audio_index )
 	{
+		pthread_mutex_lock( &self->open_mutex );
 		if ( self->audio_codec[ self->audio_index ] )
-		{
-			avformat_lock();
 			avcodec_close( self->audio_codec[ self->audio_index ] );
-			avformat_unlock();
-		}
 		self->audio_codec[ self->audio_index ] = NULL;
+		pthread_mutex_unlock( &self->open_mutex );
 	}
 	if ( self->audio_index != -1 )
 		self->audio_index = index;
@@ -2504,15 +2635,16 @@ static int producer_get_frame( mlt_producer producer, mlt_frame_ptr frame, int i
 	// Update timecode on the frame we're creating
 	mlt_frame_set_position( *frame, mlt_producer_position( producer ) );
 
-	// Set the position of this producer
-	mlt_properties_set_position( MLT_FRAME_PROPERTIES( *frame ), "avformat_position", mlt_producer_frame( producer ) );
-	
 	// Set up the video
 	producer_set_up_video( self, *frame );
 
 	// Set up the audio
 	producer_set_up_audio( self, *frame );
 
+	// Set the position of this producer
+	mlt_position position = self->seekable ? mlt_producer_frame( producer ) : self->nonseek_position++;
+	mlt_properties_set_position( MLT_FRAME_PROPERTIES( *frame ), "avformat_position", position );
+
 	// Calculate the next timecode
 	mlt_producer_prepare_next( producer );
 
@@ -2525,7 +2657,7 @@ static void producer_avformat_close( producer_avformat self )
 
 	// Cleanup av contexts
 	av_free( self->av_frame );
-	avformat_lock();
+	pthread_mutex_lock( &self->open_mutex );
 	int i;
 	for ( i = 0; i < MAX_AUDIO_STREAMS; i++ )
 	{
@@ -2535,17 +2667,28 @@ static void producer_avformat_close( producer_avformat self )
 		av_free( self->decode_buffer[i] );
 		if ( self->audio_codec[i] )
 			avcodec_close( self->audio_codec[i] );
+		self->audio_codec[i] = NULL;
 	}
 	if ( self->video_codec )
 		avcodec_close( self->video_codec );
+	self->video_codec = NULL;
 	// Close the file
+#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(17<<8)+0)
+	if ( self->dummy_context )
+		avformat_close_input( &self->dummy_context );
+	if ( self->seekable && self->audio_format )
+		avformat_close_input( &self->audio_format );
+	if ( self->video_format )
+		avformat_close_input( &self->video_format );
+#else
 	if ( self->dummy_context )
 		av_close_input_file( self->dummy_context );
 	if ( self->seekable && self->audio_format )
 		av_close_input_file( self->audio_format );
 	if ( self->video_format )
 		av_close_input_file( self->video_format );
-	avformat_unlock();
+#endif
+	pthread_mutex_unlock( &self->open_mutex );
 #ifdef VDPAU
 	vdpau_producer_close( self );
 #endif
@@ -2556,18 +2699,29 @@ static void producer_avformat_close( producer_avformat self )
 	pthread_mutex_destroy( &self->audio_mutex );
 	pthread_mutex_destroy( &self->video_mutex );
 	pthread_mutex_destroy( &self->packets_mutex );
+	pthread_mutex_destroy( &self->open_mutex );
 
 	// Cleanup the packet queues
 	AVPacket *pkt;
-	while ( ( pkt = mlt_deque_pop_back( self->apackets ) ) )
+	if ( self->apackets )
 	{
-		av_free_packet( pkt );
-		free( pkt );
+		while ( ( pkt = mlt_deque_pop_back( self->apackets ) ) )
+		{
+			av_free_packet( pkt );
+			free( pkt );
+		}
+		mlt_deque_close( self->apackets );
+		self->apackets = NULL;
 	}
-	while ( ( pkt = mlt_deque_pop_back( self->vpackets ) ) )
+	if ( self->vpackets )
 	{
-		av_free_packet( pkt );
-		free( pkt );
+		while ( ( pkt = mlt_deque_pop_back( self->vpackets ) ) )
+		{
+			av_free_packet( pkt );
+			free( pkt );
+		}
+		mlt_deque_close( self->vpackets );
+		self->vpackets = NULL;
 	}
 
 	free( self );