X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fproducer_avformat.c;h=bc7971243fb7e041062502a86327e54f9b463ac4;hb=642d69d110cb683b43857bb8385de38c58f5695d;hp=a24a34ddf71732186fde409228d1fc050497560a;hpb=9f7ca5995259a0a27842f8b308309941849b3571;p=melted

diff --git a/src/modules/avformat/producer_avformat.c b/src/modules/avformat/producer_avformat.c
index a24a34d..bc79712 100644
--- a/src/modules/avformat/producer_avformat.c
+++ b/src/modules/avformat/producer_avformat.c
@@ -572,7 +572,9 @@ 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 );
@@ -583,8 +585,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 	else
 	{
 		int ret = 0;
-		int got_picture = 0;
 		int int_position = 0;
+		got_picture = 0;
 
 		av_init_packet( &pkt );
 
@@ -615,17 +617,8 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 
 				// Decode the image
 				if ( must_decode || int_position >= req_position )
-				{
-#ifdef FF_INPUT_BUFFER_PADDING_SIZE
-					uint8_t *inbuf = mlt_pool_alloc( pkt.size + FF_INPUT_BUFFER_PADDING_SIZE );
-					memcpy( inbuf, pkt.data, pkt.size );
-					inbuf[ pkt.size ] = 0;
-					ret = avcodec_decode_video( codec_context, av_frame, &got_picture, inbuf, pkt.size );
-					mlt_pool_release( inbuf );
-#else
 					ret = avcodec_decode_video( codec_context, av_frame, &got_picture, pkt.data, pkt.size );
-#endif
-				}
+
 				if ( got_picture )
 				{
 					// Handle ignore
@@ -653,6 +646,7 @@ static int producer_get_image( mlt_frame frame, uint8_t **buffer, mlt_image_form
 				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_int( properties, "_current_position", int_position );
+				mlt_properties_set_int( properties, "_got_picture", 1 );
 			}
 
 			// We're finished with this packet regardless
@@ -885,7 +879,7 @@ 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 );
+		int16_t *temp = av_malloc( sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE );
 
 		av_init_packet( &pkt );
 
@@ -901,24 +895,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 = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_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 )
 			{
+				int data_size = sizeof( int16_t ) * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+
 				// Decode the audio
-#ifdef FF_INPUT_BUFFER_PADDING_SIZE
-				uint8_t *inbuf = mlt_pool_alloc( len + FF_INPUT_BUFFER_PADDING_SIZE );
-				memcpy( inbuf, ptr, len );
-				inbuf[ len ] = 0;
-				ret = avcodec_decode_audio2( codec_context, temp, &data_size, inbuf, len );
-				mlt_pool_release( inbuf );
+#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(29<<8)+0))
+				ret = avcodec_decode_audio2( codec_context, temp, &data_size, ptr, len );
 #else
 				ret = avcodec_decode_audio( codec_context, temp, &data_size, ptr, len );
 #endif
-
 				if ( ret < 0 )
 				{
 					ret = 0;
@@ -978,7 +968,7 @@ static int producer_get_audio( mlt_frame frame, int16_t **buffer, mlt_audio_form
 		mlt_properties_set_int( properties, "_audio_used", audio_used );
 
 		// Release the temporary audio
-		mlt_pool_release( temp );
+		av_free( temp );
 	}
 	else
 	{