]> git.sesse.net Git - mlt/blobdiff - src/modules/avformat/producer_avformat.c
producer_avformat.c: fix build on older versions of ffmpeg; whitespace cleanup
[mlt] / src / modules / avformat / producer_avformat.c
index 27478607a26370ce23a01a830d2f93989d572b5e..4ddec9aa47dcf84fb032a2493b636f01d3066c6a 100644 (file)
@@ -2,32 +2,35 @@
  * producer_avformat.c -- avformat producer
  * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
  * Author: Charles Yates <charles.yates@pandora.be>
+ * Much code borrowed from ffmpeg.c: Copyright (c) 2000-2003 Fabrice Bellard
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-// Local header files
-#include "producer_avformat.h"
-
 // MLT Header files
+#include <framework/mlt_producer.h>
 #include <framework/mlt_frame.h>
 
 // ffmpeg Header files
 #include <avformat.h>
+#include <opt.h>
 #ifdef SWSCALE
-#include <swscale.h>
+#  include <swscale.h>
+#endif
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+#  include "audioconvert.h"
 #endif
 
 // System header files
@@ -40,13 +43,13 @@ void avformat_lock( );
 void avformat_unlock( );
 
 // Forward references.
-static int producer_open( mlt_producer this, char *file );
+static int producer_open( mlt_producer this, mlt_profile profile, char *file );
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index );
 
 /** Constructor for libavformat.
 */
 
-mlt_producer producer_avformat_init( char *file )
+mlt_producer producer_avformat_init( mlt_profile profile, char *file )
 {
        mlt_producer this = NULL;
 
@@ -69,12 +72,23 @@ mlt_producer producer_avformat_init( char *file )
                        this->get_frame = producer_get_frame;
 
                        // Open the file
-                       if ( producer_open( this, file ) != 0 )
+                       if ( producer_open( this, profile, file ) != 0 )
                        {
                                // Clean up
                                mlt_producer_close( this );
                                this = NULL;
                        }
+                       else
+                       {
+                               // Close the file to release resources for large playlists - reopen later as needed
+                               mlt_properties_set_data( properties, "dummy_context", NULL, 0, NULL, NULL );
+                               mlt_properties_set_data( properties, "audio_context", NULL, 0, NULL, NULL );
+                               mlt_properties_set_data( properties, "video_context", NULL, 0, NULL, NULL );
+
+                               // Default the user-selectable indices from the auto-detected indices
+                               mlt_properties_set_int( properties, "audio_index",  mlt_properties_get_int( properties, "_audio_index" ) );
+                               mlt_properties_set_int( properties, "video_index",  mlt_properties_get_int( properties, "_video_index" ) );
+                       }
                }
        }
 
@@ -84,34 +98,77 @@ mlt_producer producer_avformat_init( char *file )
 /** Find the default streams.
 */
 
-static void find_default_streams( AVFormatContext *context, int *audio_index, int *video_index )
+static mlt_properties find_default_streams( mlt_properties meta_media, AVFormatContext *context, int *audio_index, int *video_index )
 {
        int i;
+       char key[200];
+
+       mlt_properties_set_int( meta_media, "meta.media.nb_streams", context->nb_streams );
 
        // Allow for multiple audio and video streams in the file and select first of each (if available)
-       for( i = 0; i < context->nb_streams; i++ ) 
+       for( i = 0; i < context->nb_streams; i++ )
        {
                // Get the codec context
-               AVCodecContext *codec_context = context->streams[ i ]->codec;
+               AVStream *stream = context->streams[ i ];
+               if ( ! stream ) continue;
+               AVCodecContext *codec_context = stream->codec;
+               if ( ! codec_context ) continue;
+               AVCodec *codec = avcodec_find_decoder( codec_context->codec_id );
+               if ( ! codec ) continue;
 
-               if ( avcodec_find_decoder( codec_context->codec_id ) == NULL )
-                       continue;
+               snprintf( key, sizeof(key), "meta.media.%d.stream.type", i );
 
                // Determine the type and obtain the first index of each type
-               switch( codec_context->codec_type ) 
+               switch( codec_context->codec_type )
                {
                        case CODEC_TYPE_VIDEO:
                                if ( *video_index < 0 )
                                        *video_index = i;
+                               mlt_properties_set( meta_media, key, "video" );
+                               snprintf( key, sizeof(key), "meta.media.%d.stream.frame_rate", i );
+                               mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->r_frame_rate ) );
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
+                               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.pix_fmt", i );
+                               mlt_properties_set( meta_media, key, avcodec_get_pix_fmt_name( codec_context->pix_fmt ) );
+                               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 ) );
                                break;
                        case CODEC_TYPE_AUDIO:
                                if ( *audio_index < 0 )
                                        *audio_index = i;
-                               break;
+                               mlt_properties_set( meta_media, key, "audio" );
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+                               snprintf( key, sizeof(key), "meta.media.%d.codec.sample_fmt", i );
+                               mlt_properties_set( meta_media, key, avcodec_get_sample_fmt_name( codec_context->sample_fmt ) );
+#endif
+                               snprintf( key, sizeof(key), "meta.media.%d.codec.sample_rate", i );
+                               mlt_properties_set_int( meta_media, key, codec_context->sample_rate );
+                               snprintf( key, sizeof(key), "meta.media.%d.codec.channels", i );
+                               mlt_properties_set_int( meta_media, key, codec_context->channels );
+                               break;
                        default:
-                               break;
+                               break;
                }
+//             snprintf( key, sizeof(key), "meta.media.%d.stream.time_base", i );
+//             mlt_properties_set_double( meta_media, key, av_q2d( context->streams[ i ]->time_base ) );
+               snprintf( key, sizeof(key), "meta.media.%d.codec.name", i );
+               mlt_properties_set( meta_media, key, codec->name );
+               snprintf( key, sizeof(key), "meta.media.%d.codec.long_name", i );
+               mlt_properties_set( meta_media, key, codec->long_name );
+               snprintf( key, sizeof(key), "meta.media.%d.codec.bit_rate", i );
+               mlt_properties_set_int( meta_media, key, codec_context->bit_rate );
+//             snprintf( key, sizeof(key), "meta.media.%d.codec.time_base", i );
+//             mlt_properties_set_double( meta_media, key, av_q2d( codec_context->time_base ) );
+               snprintf( key, sizeof(key), "meta.media.%d.codec.profile", i );
+               mlt_properties_set_int( meta_media, key, codec_context->profile );
+               snprintf( key, sizeof(key), "meta.media.%d.codec.level", i );
+               mlt_properties_set_int( meta_media, key, codec_context->level );
        }
+
+       return meta_media;
 }
 
 /** Producer file destructor.
@@ -150,10 +207,92 @@ static void producer_codec_close( void *codec )
        }
 }
 
+static inline int dv_is_pal( AVPacket *pkt )
+{
+       return pkt->data[3] & 0x80;
+}
+
+static int dv_is_wide( AVPacket *pkt )
+{
+       int i = 80 /* block size */ *3 /* VAUX starts at block 3 */ +3 /* skip block header */;
+
+       for ( ; i < pkt->size; i += 5 /* packet size */ )
+       {
+               if ( pkt->data[ i ] == 0x61 )
+               {
+                       uint8_t x = pkt->data[ i + 2 ] & 0x7;
+                       return ( x == 2 ) || ( x == 7 );
+               }
+       }
+       return 0;
+}
+
+static double get_aspect_ratio( AVStream *stream, AVCodecContext *codec_context, AVPacket *pkt )
+{
+       double aspect_ratio = 1.0;
+
+       if ( codec_context->codec_id == CODEC_ID_DVVIDEO )
+       {
+               if ( pkt )
+               {
+                       if ( dv_is_pal( pkt ) )
+                       {
+                               aspect_ratio = dv_is_wide( pkt )
+                                       ? 64.0/45.0 // 16:9 PAL
+                                       : 16.0/15.0; // 4:3 PAL
+                       }
+                       else
+                       {
+                               aspect_ratio = dv_is_wide( pkt )
+                                       ? 32.0/27.0 // 16:9 NTSC
+                                       : 8.0/9.0; // 4:3 NTSC
+                       }
+               }
+               else
+               {
+                       AVRational ar =
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
+                               stream->sample_aspect_ratio;
+#else
+                               codec_context->sample_aspect_ratio;
+#endif
+                       // Override FFmpeg's notion of DV aspect ratios, which are
+                       // based upon a width of 704. Since we do not have a normaliser
+                       // that crops (nor is cropping 720 wide ITU-R 601 video always desirable)
+                       // we just coerce the values to facilitate a passive behaviour through
+                       // the rescale normaliser when using equivalent producers and consumers.
+                       // = display_aspect / (width * height)
+                       if ( ar.num == 10 && ar.den == 11 )
+                               aspect_ratio = 8.0/9.0; // 4:3 NTSC
+                       else if ( ar.num == 59 && ar.den == 54 )
+                               aspect_ratio = 16.0/15.0; // 4:3 PAL
+                       else if ( ar.num == 40 && ar.den == 33 )
+                               aspect_ratio = 32.0/27.0; // 16:9 NTSC
+                       else if ( ar.num == 118 && ar.den == 81 )
+                               aspect_ratio = 64.0/45.0; // 16:9 PAL
+               }
+       }
+       else
+       {
+               AVRational codec_sar = codec_context->sample_aspect_ratio;
+               AVRational stream_sar =
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(21<<8)+0)
+                       stream->sample_aspect_ratio;
+#else
+                       { 0, 1 };
+#endif
+               if ( codec_sar.num > 0 )
+                       aspect_ratio = av_q2d( codec_sar );
+               else if ( stream_sar.num > 0 )
+                       aspect_ratio = av_q2d( stream_sar );
+       }
+       return aspect_ratio;
+}
+
 /** Open the file.
 */
 
-static int producer_open( mlt_producer this, char *file )
+static int producer_open( mlt_producer this, mlt_profile profile, char *file )
 {
        // Return an error code (0 == no error)
        int error = 0;
@@ -165,11 +304,11 @@ static int producer_open( mlt_producer this, char *file )
        mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
 
        // We will treat everything with the producer fps
-       double fps = mlt_properties_get_double( properties, "fps" );
+       double fps = mlt_profile_fps( profile );
 
        // Lock the mutex now
        avformat_lock( );
-       
+
        // If "MRL", then create AVInputFormat
        AVInputFormat *format = NULL;
        AVFormatParameters *params = NULL;
@@ -178,7 +317,7 @@ static int producer_open( mlt_producer this, char *file )
 
        // AV option (0 = both, 1 = video, 2 = audio)
        int av = 0;
-       
+
        // Setting lowest log level
        av_log_set_level( -1 );
 
@@ -187,27 +326,29 @@ static int producer_open( mlt_producer this, char *file )
        {
                // 'file' becomes format abbreviation
                mrl[0] = 0;
-       
+
                // Lookup the format
                format = av_find_input_format( file );
-               
+
                // Eat the format designator
                file = ++mrl;
-               
+
                if ( format )
                {
                        // Allocate params
                        params = calloc( sizeof( AVFormatParameters ), 1 );
-                       
+
                        // These are required by video4linux (defaults)
                        params->width = 640;
                        params->height = 480;
                        params->time_base= (AVRational){1,25};
-                       params->device = file;
+                       // params->device = file;
                        params->channels = 2;
                        params->sample_rate = 48000;
                }
-               
+
+               // XXX: this does not work anymore since avdevice
+               // TODO: make producer_avddevice?
                // Parse out params
                mrl = strchr( file, '?' );
                while ( mrl )
@@ -249,7 +390,7 @@ static int producer_open( mlt_producer this, char *file )
 
        // Now attempt to open the file
        error = av_open_input_file( &context, file, format, 0, params ) < 0;
-       
+
        // Cleanup AVFormatParameters
        free( standard );
        free( params );
@@ -269,29 +410,34 @@ static int producer_open( mlt_producer this, char *file )
                        int av_bypass = 0;
 
                        // Now set properties where we can (use default unknowns if required)
-                       if ( context->duration != AV_NOPTS_VALUE ) 
+                       if ( context->duration != AV_NOPTS_VALUE )
                        {
                                // This isn't going to be accurate for all formats
-                               mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps );
-                               mlt_properties_set_position( properties, "out", frames - 2 );
-                               mlt_properties_set_position( properties, "length", frames - 1 );
+                               mlt_position frames = ( mlt_position )( ( ( double )context->duration / ( double )AV_TIME_BASE ) * fps + 0.5 );
+                               mlt_properties_set_position( properties, "out", frames - 1 );
+                               mlt_properties_set_position( properties, "length", frames );
                        }
 
                        // Find default audio and video streams
-                       find_default_streams( context, &audio_index, &video_index );
+                       find_default_streams( properties, context, &audio_index, &video_index );
+
+                       if ( context->start_time != AV_NOPTS_VALUE )
+                               mlt_properties_set_double( properties, "_start_time", context->start_time );
 
-            if ( context->start_time != AV_NOPTS_VALUE )
-                mlt_properties_set_double( properties, "_start_time", context->start_time );
-                       
                        // Check if we're seekable (something funny about mpeg here :-/)
-                       if ( strcmp( file, "pipe:" ) && strncmp( file, "http://", 6 ) )
+                       if ( strcmp( file, "pipe:" ) && strncmp( file, "http://", 6 )  && strncmp( file, "udp:", 4 )  && strncmp( file, "tcp:", 4 ) && strncmp( file, "rtsp:", 5 )  && strncmp( file, "rtp:", 4 ) )
+                       {
                                mlt_properties_set_int( properties, "seekable", av_seek_frame( context, -1, mlt_properties_get_double( properties, "_start_time" ), AVSEEK_FLAG_BACKWARD ) >= 0 );
+                               mlt_properties_set_data( properties, "dummy_context", context, 0, producer_file_close, NULL );
+                               av_open_input_file( &context, file, NULL, 0, NULL );
+                               av_find_stream_info( context );
+                       }
                        else
                                av_bypass = 1;
 
                        // Store selected audio and video indexes on properties
-                       mlt_properties_set_int( properties, "audio_index", audio_index );
-                       mlt_properties_set_int( properties, "video_index", video_index );
+                       mlt_properties_set_int( properties, "_audio_index", audio_index );
+                       mlt_properties_set_int( properties, "_video_index", video_index );
                        mlt_properties_set_int( properties, "_last_position", -1 );
 
                        // Fetch the width, height and aspect ratio
@@ -300,31 +446,51 @@ static int producer_open( mlt_producer this, char *file )
                                AVCodecContext *codec_context = context->streams[ video_index ]->codec;
                                mlt_properties_set_int( properties, "width", codec_context->width );
                                mlt_properties_set_int( properties, "height", codec_context->height );
-                               mlt_properties_set_double( properties, "aspect_ratio", av_q2d( codec_context->sample_aspect_ratio ) );
+
+                               if ( codec_context->codec_id == CODEC_ID_DVVIDEO )
+                               {
+                                       // Fetch the first frame of DV so we can read it directly
+                                       AVPacket pkt;
+                                       int ret = 0;
+                                       while ( ret >= 0 )
+                                       {
+                                               ret = av_read_frame( context, &pkt );
+                                               if ( ret >= 0 && pkt.stream_index == video_index && pkt.size > 0 )
+                                               {
+                                                       mlt_properties_set_double( properties, "aspect_ratio",
+                                                               get_aspect_ratio( context->streams[ video_index ], codec_context, &pkt ) );
+                                                       break;
+                                               }
+                                       }
+                               }
+                               else
+                               {
+                                       mlt_properties_set_double( properties, "aspect_ratio",
+                                               get_aspect_ratio( context->streams[ video_index ], codec_context, NULL ) );
+                               }
                        }
 
                        // Read Metadata
-                       if (context->title != NULL) 
+                       if (context->title != NULL)
                                mlt_properties_set(properties, "meta.attr.title.markup", context->title );
-                       if (context->author != NULL) 
+                       if (context->author != NULL)
                                mlt_properties_set(properties, "meta.attr.author.markup", context->author );
-                       if (context->copyright != NULL) 
+                       if (context->copyright != NULL)
                                mlt_properties_set(properties, "meta.attr.copyright.markup", context->copyright );
-                       if (context->comment != NULL) 
+                       if (context->comment != NULL)
                                mlt_properties_set(properties, "meta.attr.comment.markup", context->comment );
-                       if (context->album != NULL) 
+                       if (context->album != NULL)
                                mlt_properties_set(properties, "meta.attr.album.markup", context->album );
-                       if (context->year != 0) 
+                       if (context->year != 0)
                                mlt_properties_set_int(properties, "meta.attr.year.markup", context->year );
-                       if (context->track != 0) 
+                       if (context->track != 0)
                                mlt_properties_set_int(properties, "meta.attr.track.markup", context->track );
-                       
+
                        // We're going to cheat here - for a/v files, we will have two contexts (reasoning will be clear later)
-                       if ( av == 0 && !av_bypass && audio_index != -1 && video_index != -1 )
+                       if ( av == 0 && audio_index != -1 && video_index != -1 )
                        {
                                // We'll use the open one as our video_context
                                mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL );
-                               av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
 
                                // And open again for our audio context
                                av_open_input_file( &context, file, NULL, 0, NULL );
@@ -337,7 +503,6 @@ static int producer_open( mlt_producer this, char *file )
                        {
                                // We only have a video context
                                mlt_properties_set_data( properties, "video_context", context, 0, producer_file_close, NULL );
-                               av_seek_frame( context, -1, 0, AVSEEK_FLAG_BACKWARD );
                        }
                        else if ( audio_index != -1 )
                        {
@@ -365,14 +530,7 @@ static int producer_open( mlt_producer this, char *file )
 
 static double producer_time_of_frame( mlt_producer this, mlt_position position )
 {
-       // Get the properties
-       mlt_properties properties = MLT_PRODUCER_PROPERTIES( this );
-
-       // Obtain the fps
-       double fps = mlt_properties_get_double( properties, "fps" );
-
-       // Do the calc
-       return ( double )position / fps;
+       return ( double )position / mlt_producer_get_fps( this );
 }
 
 static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt, mlt_image_format format, int width, int height )
@@ -440,6 +598,45 @@ static inline void convert_image( AVFrame *frame, uint8_t *buffer, int pix_fmt,
 #endif
 }
 
+/** Allocate the image buffer and set it on the frame.
+*/
+
+static int allocate_buffer( mlt_properties frame_properties, AVCodecContext *codec_context, uint8_t **buffer, mlt_image_format *format, int *width, int *height )
+{
+       int size = 0;
+
+       if ( codec_context->width == 0 || codec_context->height == 0 )
+               return size;
+
+       *width = codec_context->width;
+       *height = codec_context->height;
+       mlt_properties_set_int( frame_properties, "width", *width );
+       mlt_properties_set_int( frame_properties, "height", *height );
+
+       switch ( *format )
+       {
+               case mlt_image_yuv420p:
+                       size = *width * 3 * ( *height + 1 ) / 2;
+                       break;
+               case mlt_image_rgb24:
+                       size = *width * ( *height + 1 ) * 3;
+                       break;
+               default:
+                       *format = mlt_image_yuv422;
+                       size = *width * ( *height + 1 ) * 2;
+                       break;
+       }
+
+       // Construct the output image
+       *buffer = mlt_pool_alloc( size );
+       if ( *buffer )
+               mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL );
+       else
+               size = 0;
+
+       return size;
+}
+
 /** Get an image from a frame.
 */
 
@@ -451,7 +648,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Obtain the frame number of this frame
        mlt_position position = mlt_properties_get_position( frame_properties, "avformat_position" );
 
-       // Get the producer 
+       // Get the producer
        mlt_producer this = mlt_properties_get_data( frame_properties, "avformat_producer", NULL );
 
        // Get the producer properties
@@ -466,9 +663,6 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Obtain the expected frame numer
        mlt_position expected = mlt_properties_get_position( properties, "_video_expected" );
 
-       // Calculate the real time code
-       double real_timecode = producer_time_of_frame( this, position );
-
        // Get the video stream
        AVStream *stream = context->streams[ index ];
 
@@ -487,53 +681,22 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        // Special case ffwd handling
        int ignore = 0;
 
-       // Current time calcs
-       int current_position = mlt_properties_get_double( properties, "_current_position" );
-
        // We may want to use the source fps if available
        double source_fps = mlt_properties_get_double( properties, "source_fps" );
-       double fps = mlt_properties_get_double( properties, "fps" );
+       double fps = mlt_producer_get_fps( this );
 
        // This is the physical frame position in the source
-       int req_position = ( int )( position / fps * source_fps );
+       int req_position = ( int )( position / fps * source_fps + 0.5 );
 
        // Get the seekable status
        int seekable = mlt_properties_get_int( properties, "seekable" );
 
-       // Generate the size in bytes
-       int size = 0; 
-
        // Hopefully provide better support for streams...
        int av_bypass = mlt_properties_get_int( properties, "av_bypass" );
 
        // Determines if we have to decode all frames in a sequence
        int must_decode = 1;
 
-       // Set the result arguments that we know here (only *buffer is now required)
-       *width = codec_context->width;
-       *height = codec_context->height;
-
-       switch ( *format )
-       {
-               case mlt_image_yuv420p:
-                       size = *width * 3 * ( *height + 1 ) / 2;
-                       break;
-               case mlt_image_rgb24:
-                       size = *width * ( *height + 1 ) * 3;
-                       break;
-               default:
-                       *format = mlt_image_yuv422;
-                       size = *width * ( *height + 1 ) * 2;
-                       break;
-       }
-
-       // Set this on the frame properties
-       mlt_properties_set_int( frame_properties, "width", *width );
-       mlt_properties_set_int( frame_properties, "height", *height );
-
-       // Construct the output image
-       *buffer = mlt_pool_alloc( size );
-
        // Temporary hack to improve intra frame only
        must_decode = strcmp( codec_context->codec->name, "mjpeg" ) &&
                                  strcmp( codec_context->codec->name, "rawvideo" ) &&
@@ -555,7 +718,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                else if ( seekable && ( position < expected || position - expected >= 12 ) )
                {
                        // Calculate the timestamp for the requested frame
-                       int64_t timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE );
+                       int64_t timestamp = ( int64_t )( ( double )req_position / source_fps * AV_TIME_BASE + 0.5 );
                        if ( ( uint64_t )context->start_time != AV_NOPTS_VALUE )
                                timestamp += context->start_time;
                        if ( must_decode )
@@ -565,7 +728,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 
                        // Set to the timestamp
                        av_seek_frame( context, -1, timestamp, AVSEEK_FLAG_BACKWARD );
-       
+
                        // Remove the cached info relating to the previous position
                        mlt_properties_set_int( properties, "_current_position", -1 );
                        mlt_properties_set_int( properties, "_last_position", -1 );
@@ -575,28 +738,27 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        }
 
        // Duplicate the last image if necessary (see comment on rawvideo below)
-       if ( av_frame != NULL && ( paused || mlt_properties_get_int( properties, "_current_position" ) >= req_position ) && av_bypass == 0 )
+       int current_position = mlt_properties_get_int( properties, "_current_position" );
+       int got_picture = mlt_properties_get_int( properties, "_got_picture" );
+       if ( av_frame != NULL && got_picture && ( paused || current_position >= req_position ) && av_bypass == 0 )
        {
                // Duplicate it
-               convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
-
-               // Set this on the frame properties
-               mlt_properties_set_data( frame_properties, "image", *buffer, size, ( mlt_destructor )mlt_pool_release, NULL );
+               if ( allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) )
+                       convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
+               else
+                       mlt_frame_get_image( frame, buffer, format, width, height, writable );
        }
        else
        {
                int ret = 0;
-               int got_picture = 0;
                int int_position = 0;
+               got_picture = 0;
 
                av_init_packet( &pkt );
 
                // Construct an AVFrame for YUV422 conversion
                if ( av_frame == NULL )
-               {
                        av_frame = avcodec_alloc_frame( );
-                       mlt_properties_set_data( properties, "av_frame", av_frame, 0, av_free, NULL );
-               }
 
                while( ret >= 0 && !got_picture )
                {
@@ -607,10 +769,9 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                        if ( ret >= 0 && pkt.stream_index == index && pkt.size > 0 )
                        {
                                // Determine time code of the packet
-                               int_position = ( int )( av_q2d( stream->time_base ) * pkt.dts * source_fps );
+                               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 );
-
+                                       int_position -= ( int )( context->start_time * source_fps / AV_TIME_BASE + 0.5 );
                                int last_position = mlt_properties_get_int( properties, "_last_position" );
                                if ( int_position == last_position )
                                        int_position = last_position + 1;
@@ -637,21 +798,33 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
                                                got_picture = 0;
                                        }
                                }
+                               av_free_packet( &pkt );
+                       }
+                       else if ( ret >= 0 )
+                       {
+                               av_free_packet( &pkt );
                        }
 
                        // Now handle the picture if we have one
                        if ( got_picture )
                        {
-                               mlt_properties_set_int( frame_properties, "progressive", !av_frame->interlaced_frame );
-                               mlt_properties_set_int( frame_properties, "top_field_first", av_frame->top_field_first );
-                               convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
-                               mlt_properties_set_data( frame_properties, "image", *buffer, size, (mlt_destructor)mlt_pool_release, NULL );
-                               mlt_properties_set_double( properties, "_current_position", int_position );
+                               if ( allocate_buffer( frame_properties, codec_context, buffer, format, width, height ) )
+                               {
+                                       convert_image( av_frame, *buffer, codec_context->pix_fmt, *format, *width, *height );
+                                       mlt_properties_set_int( frame_properties, "progressive", !av_frame->interlaced_frame );
+                                       mlt_properties_set_int( properties, "top_field_first", av_frame->top_field_first );
+                                       mlt_properties_set_int( properties, "_current_position", int_position );
+                                       mlt_properties_set_int( properties, "_got_picture", 1 );
+                                       mlt_properties_set_data( properties, "av_frame", av_frame, 0, av_free, NULL );
+                               }
+                               else
+                               {
+                                       got_picture = 0;
+                               }
                        }
-
-                       // We're finished with this packet regardless
-                       av_free_packet( &pkt );
                }
+               if ( !got_picture )
+                       mlt_frame_get_image( frame, buffer, format, width, height, writable );
        }
 
        // Very untidy - for rawvideo, the packet contains the frame, hence the free packet
@@ -668,6 +841,28 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
        return 0;
 }
 
+/** Process properties as AVOptions and apply to AV context obj
+*/
+
+static void apply_properties( void *obj, mlt_properties properties, int flags )
+{
+       int i;
+       int count = mlt_properties_count( properties );
+       for ( i = 0; i < count; i++ )
+       {
+               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 >= ((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) );
+#endif
+       }
+}
+
 /** Set up video handling.
 */
 
@@ -682,10 +877,38 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
        // Get the video_index
        int index = mlt_properties_get_int( properties, "video_index" );
 
+       // Reopen the file if necessary
+       if ( !context && index > -1 )
+       {
+               mlt_events_block( properties, this );
+               producer_open( this, mlt_service_profile( MLT_PRODUCER_SERVICE(this) ),
+                       mlt_properties_get( properties, "resource" ) );
+               context = mlt_properties_get_data( properties, "video_context", NULL );
+               mlt_properties_set_data( properties, "dummy_context", NULL, 0, NULL, NULL );
+               mlt_events_unblock( properties, this );
+
+               // Process properties as AVOptions
+               apply_properties( context, properties, AV_OPT_FLAG_DECODING_PARAM );
+       }
+
+       // Exception handling for video_index
+       if ( context && index >= (int) context->nb_streams )
+       {
+               // Get the last video stream
+               for ( index = context->nb_streams - 1; index >= 0 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_VIDEO; --index );
+               mlt_properties_set_int( properties, "video_index", index );
+       }
+       if ( context && index > -1 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_VIDEO )
+       {
+               // Invalidate the video stream
+               index = -1;
+               mlt_properties_set_int( properties, "video_index", index );
+       }
+
        // Get the frame properties
        mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
 
-       if ( context != NULL && index != -1 )
+       if ( context && index > -1 )
        {
                // Get the video stream
                AVStream *stream = context->streams[ index ];
@@ -696,13 +919,38 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                // Get the codec
                AVCodec *codec = mlt_properties_get_data( properties, "video_codec", NULL );
 
+               // Update the video properties if the index changed
+               if ( index != mlt_properties_get_int( properties, "_video_index" ) )
+               {
+                       // Reset the video properties if the index changed
+                       mlt_properties_set_int( properties, "_video_index", index );
+                       mlt_properties_set_data( properties, "video_codec", NULL, 0, NULL, NULL );
+                       mlt_properties_set_int( properties, "width", codec_context->width );
+                       mlt_properties_set_int( properties, "height", codec_context->height );
+                       // TODO: get the first usable AVPacket and reset the stream position
+                       mlt_properties_set_double( properties, "aspect_ratio",
+                               get_aspect_ratio( context->streams[ index ], codec_context, NULL ) );
+                       codec = NULL;
+               }
+
                // Initialise the codec if necessary
                if ( codec == NULL )
                {
+                       // Initialise multi-threading
+                       int thread_count = mlt_properties_get_int( properties, "threads" );
+                       if ( thread_count == 0 && getenv( "MLT_AVFORMAT_THREADS" ) )
+                               thread_count = atoi( getenv( "MLT_AVFORMAT_THREADS" ) );
+                       if ( thread_count > 1 )
+                       {
+                               avcodec_thread_init( codec_context, thread_count );
+                               codec_context->thread_count = thread_count;
+                       }
+
                        // Find the codec
                        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( );
                        if ( codec != NULL && avcodec_open( codec_context, codec ) >= 0 )
                        {
                                // Now store the codec with its destructor
@@ -712,47 +960,37 @@ static void producer_set_up_video( mlt_producer this, mlt_frame frame )
                        {
                                // Remember that we can't use this later
                                mlt_properties_set_int( properties, "video_index", -1 );
+                               index = -1;
                        }
+                       avformat_unlock( );
+
+                       // Process properties as AVOptions
+                       apply_properties( codec_context, properties, AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
                }
 
                // No codec, no show...
-               if ( codec != NULL )
+               if ( codec && index > -1 )
                {
                        double source_fps = 0;
-                       int norm_aspect_ratio = mlt_properties_get_int( properties, "norm_aspect_ratio" );
                        double force_aspect_ratio = mlt_properties_get_double( properties, "force_aspect_ratio" );
-                       double aspect_ratio;
-
-                       // XXX: We won't know the real aspect ratio until an image is decoded
-                       // but we do need it now (to satisfy filter_resize) - take a guess based
-                       // on pal/ntsc
-                       if ( force_aspect_ratio > 0.0 )
-                       {
-                               aspect_ratio = force_aspect_ratio;
-                       }
-                       else if ( !norm_aspect_ratio && codec_context->sample_aspect_ratio.num > 0 )
-                       {
-                               aspect_ratio = av_q2d( codec_context->sample_aspect_ratio );
-                       }
-                       else
-                       {
-                               int is_pal = mlt_properties_get_double( properties, "fps" ) == 25.0;
-                               aspect_ratio = is_pal ? 59.0/54.0 : 10.0/11.0;
-                       }
+                       double aspect_ratio = ( force_aspect_ratio > 0.0 ) ?
+                               force_aspect_ratio : mlt_properties_get_double( properties, "aspect_ratio" );
 
                        // Determine the fps
                        source_fps = ( double )codec_context->time_base.den / ( codec_context->time_base.num == 0 ? 1 : codec_context->time_base.num );
 
                        // We'll use fps if it's available
-                       if ( source_fps > 0 && source_fps < 30 )
+                       if ( source_fps > 0 )
                                mlt_properties_set_double( properties, "source_fps", source_fps );
                        else
-                               mlt_properties_set_double( properties, "source_fps", mlt_properties_get_double( properties, "fps" ) );
+                               mlt_properties_set_double( properties, "source_fps", mlt_producer_get_fps( this ) );
                        mlt_properties_set_double( properties, "aspect_ratio", aspect_ratio );
-                       
+
                        // Set the width and height
                        mlt_properties_set_int( frame_properties, "width", codec_context->width );
                        mlt_properties_set_int( frame_properties, "height", codec_context->height );
+                       mlt_properties_set_int( frame_properties, "real_width", codec_context->width );
+                       mlt_properties_set_int( frame_properties, "real_height", codec_context->height );
                        mlt_properties_set_double( frame_properties, "aspect_ratio", aspect_ratio );
 
                        mlt_frame_push_get_image( frame, producer_get_image );
@@ -780,7 +1018,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        // Obtain the frame number of this frame
        mlt_position position = mlt_properties_get_position( frame_properties, "avformat_position" );
 
-       // Get the producer 
+       // Get the producer
        mlt_producer this = mlt_properties_get_data( frame_properties, "avformat_producer", NULL );
 
        // Get the producer properties
@@ -801,8 +1039,15 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        // Obtain the resample context if it exists (not always needed)
        ReSampleContext *resample = mlt_properties_get_data( properties, "audio_resample", NULL );
 
-       // Obtain the audio buffer
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+       // Get the format converter context if it exists
+       AVAudioConvert *convert = mlt_properties_get_data( properties, "audio_convert", NULL );
+#endif
+
+       // Obtain the audio buffers
        int16_t *audio_buffer = mlt_properties_get_data( properties, "audio_buffer", NULL );
+       int16_t *decode_buffer = mlt_properties_get_data( properties, "decode_buffer", NULL );
+       int16_t *convert_buffer = mlt_properties_get_data( properties, "convert_buffer", NULL );
 
        // Get amount of audio used
        int audio_used =  mlt_properties_get_int( properties, "_audio_used" );
@@ -822,7 +1067,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        // Number of frames to ignore (for ffwd)
        int ignore = 0;
 
-       // Flag for paused (silence) 
+       // Flag for paused (silence)
        int paused = 0;
 
        // Check for resample and create if necessary
@@ -840,6 +1085,17 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                *frequency = codec_context->sample_rate;
        }
 
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+       // Check for audio format converter and create if necessary
+       // TODO: support higher resolutions than 16-bit.
+       if ( convert == NULL && codec_context->sample_fmt != SAMPLE_FMT_S16 )
+       {
+               // Create single channel converter for interleaved with no mixing matrix
+               convert = av_audio_convert_alloc( SAMPLE_FMT_S16, 1, codec_context->sample_fmt, 1, NULL, 0 );
+               mlt_properties_set_data( properties, "audio_convert", convert, 0, ( mlt_destructor )av_audio_convert_free, NULL );
+       }
+#endif
+
        // Check for audio buffer and create if necessary
        if ( audio_buffer == NULL )
        {
@@ -850,6 +1106,28 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                mlt_properties_set_data( properties, "audio_buffer", audio_buffer, 0, ( mlt_destructor )mlt_pool_release, NULL );
        }
 
+       // Check for decoder buffer and create if necessary
+       if ( decode_buffer == NULL )
+       {
+               // Allocate the audio buffer
+               decode_buffer = av_malloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
+
+               // And store it on properties for reuse
+               mlt_properties_set_data( properties, "decode_buffer", decode_buffer, 0, ( mlt_destructor )av_free, NULL );
+       }
+
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+       // Check for format converter buffer and create if necessary
+       if ( resample && convert && convert_buffer == NULL )
+       {
+               // Allocate the audio buffer
+               convert_buffer = mlt_pool_alloc( AVCODEC_MAX_AUDIO_FRAME_SIZE * sizeof( int16_t ) );
+
+               // And store it on properties for reuse
+               mlt_properties_set_data( properties, "convert_buffer", convert_buffer, 0, ( mlt_destructor )mlt_pool_release, NULL );
+       }
+#endif
+
        // Seek if necessary
        if ( position != expected )
        {
@@ -879,7 +1157,6 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
        {
                int ret = 0;
                int got_audio = 0;
-               int16_t *temp = mlt_pool_alloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE );
 
                av_init_packet( &pkt );
 
@@ -895,16 +1172,20 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                        // Read a packet
                        ret = av_read_frame( context, &pkt );
 
-               int len = pkt.size;
-               uint8_t *ptr = pkt.data;
-                       int data_size;
+                       int len = pkt.size;
+                       uint8_t *ptr = pkt.data;
 
                        // We only deal with audio from the selected audio_index
                        while ( ptr != NULL && ret >= 0 && pkt.stream_index == index && len > 0 )
                        {
-                               // Decode the audio
-                               ret = avcodec_decode_audio( codec_context, temp, &data_size, ptr, len );
+                               int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
 
+                               // Decode the audio
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
+                               ret = avcodec_decode_audio2( codec_context, decode_buffer, &data_size, ptr, len );
+#else
+                               ret = avcodec_decode_audio( codec_context, decode_buffer, &data_size, ptr, len );
+#endif
                                if ( ret < 0 )
                                {
                                        ret = 0;
@@ -916,14 +1197,41 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 
                                if ( data_size > 0 )
                                {
-                                       if ( resample != NULL )
+                                       int src_stride[6]= { av_get_bits_per_sample_format( codec_context->sample_fmt ) / 8 };
+                                       int dst_stride[6]= { av_get_bits_per_sample_format( SAMPLE_FMT_S16 ) / 8 };
+
+                                       if ( resample )
                                        {
-                                               audio_used += audio_resample( resample, &audio_buffer[ audio_used * *channels ], temp, data_size / ( codec_context->channels * sizeof( int16_t ) ) );
+                                               int16_t *source = decode_buffer;
+                                               int16_t *dest = &audio_buffer[ audio_used * *channels ];
+                                               int convert_samples = data_size / src_stride[0];
+
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+                                               if ( convert )
+                                               {
+                                                       const void *src_buf[6] = { decode_buffer };
+                                                       void *dst_buf[6] = { convert_buffer };
+                                                       av_audio_convert( convert, dst_buf, dst_stride, src_buf, src_stride, convert_samples );
+                                                       source = convert_buffer;
+                                               }
+#endif
+                                               audio_used += audio_resample( resample, dest, source, convert_samples / codec_context->channels );
                                        }
                                        else
                                        {
-                                               memcpy( &audio_buffer[ audio_used * *channels ], temp, data_size );
-                                               audio_used += data_size / ( codec_context->channels * sizeof( int16_t ) );
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(71<<8)+0))
+                                               if ( convert )
+                                               {
+                                                       const void *src_buf[6] = { decode_buffer };
+                                                       void *dst_buf[6] = { &audio_buffer[ audio_used * *channels ] };
+                                                       av_audio_convert( convert, dst_buf, dst_stride, src_buf, src_stride, data_size / src_stride[0] );
+                                               }
+                                               else
+#endif
+                                               {
+                                                       memcpy( &audio_buffer[ audio_used * *channels ], decode_buffer, data_size );
+                                               }
+                                               audio_used += data_size / *channels / src_stride[0];
                                        }
 
                                        // Handle ignore
@@ -936,9 +1244,12 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                                }
 
                                // If we're behind, ignore this packet
-                               float current_pts = av_q2d( stream->time_base ) * pkt.pts;
-                               if ( seekable && ( !ignore && current_pts <= ( real_timecode - 0.02 ) ) )
-                                       ignore = 1;
+                               if ( pkt.pts >= 0 )
+                               {
+                                       float current_pts = av_q2d( stream->time_base ) * pkt.pts;
+                                       if ( seekable && ( !ignore && current_pts <= ( real_timecode - 0.02 ) ) )
+                                               ignore = 1;
+                               }
                        }
 
                        // We're finished with this packet regardless
@@ -959,12 +1270,9 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
                {
                        memset( *buffer, 0, *samples * *channels * sizeof( int16_t ) );
                }
-               
+
                // Store the number of audio samples still available
                mlt_properties_set_int( properties, "_audio_used", audio_used );
-
-               // Release the temporary audio
-               mlt_pool_release( temp );
        }
        else
        {
@@ -993,8 +1301,38 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
        // Get the audio_index
        int index = mlt_properties_get_int( properties, "audio_index" );
 
+       // Reopen the file if necessary
+       if ( !context && index > -1 )
+       {
+               mlt_events_block( properties, this );
+               producer_open( this, mlt_service_profile( MLT_PRODUCER_SERVICE(this) ),
+                       mlt_properties_get( properties, "resource" ) );
+               context = mlt_properties_get_data( properties, "audio_context", NULL );
+               mlt_properties_set_data( properties, "dummy_context", NULL, 0, NULL, NULL );
+               mlt_events_unblock( properties, this );
+       }
+
+       // Exception handling for audio_index
+       if ( context && index >= (int) context->nb_streams )
+       {
+               for ( index = context->nb_streams - 1; index >= 0 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO; --index );
+               mlt_properties_set_int( properties, "audio_index", index );
+       }
+       if ( context && index > -1 && context->streams[ index ]->codec->codec_type != CODEC_TYPE_AUDIO )
+       {
+               index = -1;
+               mlt_properties_set_int( properties, "audio_index", index );
+       }
+
+       // Update the audio properties if the index changed
+       if ( index > -1 && index != mlt_properties_get_int( properties, "_audio_index" ) )
+       {
+               mlt_properties_set_int( properties, "_audio_index", index );
+               mlt_properties_set_data( properties, "audio_codec", NULL, 0, NULL, NULL );
+       }
+
        // Deal with audio context
-       if ( context != NULL && index != -1 )
+       if ( context != NULL && index > -1 )
        {
                // Get the frame properties
                mlt_properties frame_properties = MLT_FRAME_PROPERTIES( frame );
@@ -1015,6 +1353,7 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
                        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( );
                        if ( codec != NULL && avcodec_open( codec_context, codec ) >= 0 )
                        {
                                // Now store the codec with its destructor
@@ -1025,11 +1364,16 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
                        {
                                // Remember that we can't use this later
                                mlt_properties_set_int( properties, "audio_index", -1 );
+                               index = -1;
                        }
+                       avformat_unlock( );
+
+                       // Process properties as AVOptions
+                       apply_properties( codec_context, properties, AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM );
                }
 
                // No codec, no show...
-               if ( codec != NULL )
+               if ( codec && index > -1 )
                {
                        mlt_frame_push_audio( frame, producer_get_audio );
                        mlt_properties_set_data( frame_properties, "avformat_producer", this, 0, NULL, NULL );
@@ -1045,7 +1389,7 @@ static void producer_set_up_audio( mlt_producer this, mlt_frame frame )
 static int producer_get_frame( mlt_producer this, mlt_frame_ptr frame, int index )
 {
        // Create an empty frame
-       *frame = mlt_frame_init( );
+       *frame = mlt_frame_init( MLT_PRODUCER_SERVICE( this ) );
 
        // Update timecode on the frame we're creating
        mlt_frame_set_position( *frame, mlt_producer_position( this ) );