Sophie

Sophie

distrib > Mageia > 5 > x86_64 > media > core-release-src > by-pkgid > f8b6e526adafdbee2d25ddeeaf673d0c > files > 3

lightspark-0.7.2-19.mga5.src.rpm

--- lightspark-0.7.2/src/backends/decoder.cpp.0000	2013-03-16 19:19:18.000000000 +0800
+++ lightspark-0.7.2/src/backends/decoder.cpp	2013-07-15 14:52:45.506070344 +0800
@@ -119,7 +119,7 @@
 	if(codecId==H264)
 	{
 		//TODO: serialize access to avcodec_open
-		const enum CodecID FFMPEGcodecId=CODEC_ID_H264;
+		const enum AVCodecID FFMPEGcodecId=CODEC_ID_H264;
 		codec=avcodec_find_decoder(FFMPEGcodecId);
 		assert(codec);
 		//Ignore the frameRateHint as the rate is gathered from the video data
@@ -127,7 +127,7 @@
 	else if(codecId==H263)
 	{
 		//TODO: serialize access to avcodec_open
-		const enum CodecID FFMPEGcodecId=CODEC_ID_FLV1;
+		const enum AVCodecID FFMPEGcodecId=CODEC_ID_FLV1;
 		codec=avcodec_find_decoder(FFMPEGcodecId);
 		assert(codec);
 
@@ -138,7 +138,7 @@
 	else if(codecId==VP6)
 	{
 		//TODO: serialize access to avcodec_open
-		const enum CodecID FFMPEGcodecId=CODEC_ID_VP6F;
+		const enum AVCodecID FFMPEGcodecId=CODEC_ID_VP6F;
 		codec=avcodec_find_decoder(FFMPEGcodecId);
 		assert(codec);
 
@@ -451,7 +451,7 @@
 #ifdef ENABLE_LIBAVCODEC
 FFMpegAudioDecoder::FFMpegAudioDecoder(LS_AUDIO_CODEC audioCodec, uint8_t* initdata, uint32_t datalen):ownedContext(true)
 {
-	CodecID codecId;
+	AVCodecID codecId;
 	switch(audioCodec)
 	{
 		case AAC:
@@ -552,7 +552,7 @@
 uint32_t FFMpegAudioDecoder::decodeData(uint8_t* data, int32_t datalen, uint32_t time)
 {
 	FrameSamples& curTail=samplesBuffer.acquireLast();
-	int maxLen=AVCODEC_MAX_AUDIO_FRAME_SIZE;
+	int maxLen=192000;
 #if HAVE_AVCODEC_DECODE_AUDIO3 || HAVE_AVCODEC_DECODE_AUDIO4
 	AVPacket pkt;
 	av_init_packet(&pkt);
@@ -594,7 +594,7 @@
 uint32_t FFMpegAudioDecoder::decodePacket(AVPacket* pkt, uint32_t time)
 {
 	FrameSamples& curTail=samplesBuffer.acquireLast();
-	int maxLen=AVCODEC_MAX_AUDIO_FRAME_SIZE;
+	int maxLen=192000;
 
 #if HAVE_AVCODEC_DECODE_AUDIO4
 	avcodec_get_frame_defaults(frameIn);
--- lightspark-0.7.2/src/backends/decoder.h.0000	2013-03-16 19:19:18.000000000 +0800
+++ lightspark-0.7.2/src/backends/decoder.h	2013-07-15 14:52:26.075515460 +0800
@@ -28,7 +28,7 @@
 {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#define MAX_AUDIO_FRAME_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
+#define MAX_AUDIO_FRAME_SIZE 192000
 }
 #else
 // Correct size? 192000?