Seems to work like a charm .... :'( tears of joy !!!

Although something failed in the patching (mind you I am not that familiar with patching either)

wma.c got some stuff rejected ..; not sure what it means :-[

--- wma.c    2011-09-06 12:00:29.000000000 -0400
+++ wma.c    2011-08-30 13:49:41.000000000 -0400
@@ -187,19 +187,22 @@

 // Decode chunk into work buffer.
         pthread_mutex_lock(&ffmpeg_lock);
-#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
-        result = avcodec_decode_audio(codec->decoder_context,
- (int16_t*)(codec->work_buffer + codec->output_size * sample_size),
- &bytes_decoded,
-            codec->packet_buffer,
-            chunk_size);
-#else
         bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(26<<8)+0)
         result = avcodec_decode_audio2(codec->decoder_context,
(int16_t*)(codec->work_buffer + codec->output_size * sample_size),
&bytes_decoded,
             codec->packet_buffer,
             chunk_size);
+#else
+        AVPacket pkt;
+        av_init_packet( &pkt );
+        pkt.data = codec->packet_buffer;
+        pkt.size = chunk_size;
+        result = avcodec_decode_audio3(codec->decoder_context,
+ (int16_t*)(codec->work_buffer + codec->output_size * sample_size),
+ &bytes_decoded,
+ &pkt);
 #endif

         pthread_mutex_unlock(&ffmpeg_lock);


cheers
E



On 09/23/2011 08:54 AM, E Chalaron wrote:
ho WOW !!!! Thanks heaps for that .
Will test now ....

Cheers
E

On 09/23/2011 06:15 AM, Paul Taggart wrote:
Attached is an updated ffmpeg patch that supports both the included ffmpeg version and external ffmpeg. This patch also fixes issues with fileac3.C.

This patch appears to work on both 2.1.5 and 2.2 versions of Cinelerra.

Regards,
Paul


Reply via email to