File avifile-ffmpeg-2.0.patch of Package avifile

Overview Repositories Revisions Requests Users Attributes Meta

File avifile-ffmpeg-2.0.patch of Package avifile

Index: avifile-0.7-0.7.45/lib/aviread/FFReadStream.cpp
===================================================================
--- avifile-0.7-0.7.45.orig/lib/aviread/FFReadStream.cpp
+++ avifile-0.7-0.7.45/lib/aviread/FFReadStream.cpp
@@ -16,7 +16,7 @@
 AVM_BEGIN_NAMESPACE;
 
 static const struct id2fcc {
-    enum CodecID id;
+    enum AVCodecID id;
     uint32_t fcc;
 } id2fcct[] = {
     { CODEC_ID_MPEG1VIDEO, RIFFINFO_MPG1 },
@@ -30,7 +30,7 @@ static const struct id2fcc {
     { CODEC_ID_NONE }
 };
 
-static int get_fcc(enum CodecID id)
+static int get_fcc(enum AVCodecID id)
 {
     for (const struct id2fcc* p = id2fcct; p->id; p++)
 	if (p->id == id)
Index: avifile-0.7-0.7.45/plugins/libffmpeg/FFAudioDecoder.cpp
===================================================================
--- avifile-0.7-0.7.45.orig/plugins/libffmpeg/FFAudioDecoder.cpp
+++ avifile-0.7-0.7.45/plugins/libffmpeg/FFAudioDecoder.cpp
@@ -5,6 +5,8 @@
 
 AVM_BEGIN_NAMESPACE;
 
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
+
 FFAudioDecoder::FFAudioDecoder(AVCodec* av, const CodecInfo& info, const WAVEFORMATEX* wf)
     :IAudioDecoder(info, wf), m_pAvCodec(av), m_pAvContext(0)
 {
@@ -33,7 +35,7 @@ int FFAudioDecoder::Convert(const void*
 	m_pAvContext->sample_rate = m_pFormat->nSamplesPerSec;
 	m_pAvContext->block_align = m_pFormat->nBlockAlign;
 	m_pAvContext->codec_tag = m_Info.fourcc;
-	m_pAvContext->codec_id = (CodecID) m_pAvCodec->id;
+	m_pAvContext->codec_id = (AVCodecID) m_pAvCodec->id;
 
 	if (m_pFormat->cbSize > 0)
 	{

Places

File avifile-ffmpeg-2.0.patch of Package avifile

Places