commit 3428a40f21ab5e8864d3d1a16dad84f5cdf0e63f
Author: Jakub Bogusz <[email protected]>
Date: Fri Jul 19 18:29:34 2013 +0200
- added ffmpeg12 patch (compatibility up to ffmpeg 1.2.0)
ffmpegsource-ffmpeg12.patch | 40 ++++++++++++++++++++++++++++++++++++++++
ffmpegsource.spec | 4 +++-
2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/ffmpegsource.spec b/ffmpegsource.spec
index a8d7111..4d3de4b 100644
--- a/ffmpegsource.spec
+++ b/ffmpegsource.spec
@@ -10,7 +10,8 @@ Source0:
http://ffmpegsource.googlecode.com/files/ffms-%{version}-src.tar.bz2
# Source0-md5: 13770e29d5215ad4b68caad44b09da07
Patch0: %{name}-ffmpeg011.patch
Patch1: %{name}-ffmpeg10.patch
-Patch2: %{name}-am.patch
+Patch2: %{name}-ffmpeg12.patch
+Patch3: %{name}-am.patch
URL: http://code.google.com/p/ffmpegsource/
BuildRequires: autoconf >= 2.58
BuildRequires: automake
@@ -76,6 +77,7 @@ Statyczna biblioteka FFmpegSource.
%patch0 -p0
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%undos src/core/{indexing,lavfindexer,utils}.cpp
%{__rm} configure
diff --git a/ffmpegsource-ffmpeg12.patch b/ffmpegsource-ffmpeg12.patch
new file mode 100644
index 0000000..0c3d1c5
--- /dev/null
+++ b/ffmpegsource-ffmpeg12.patch
@@ -0,0 +1,40 @@
+--- ffms-2.17-src/src/core/audiosource.cpp.orig 2011-10-09
18:11:09.000000000 +0200
++++ ffms-2.17-src/src/core/audiosource.cpp 2013-07-19 18:09:16.374589966
+0200
+@@ -33,7 +33,7 @@
+ , CurrentFrame(NULL)
+ , TrackNumber(Track)
+ , SeekOffset(0)
+-, DecodingBuffer(AVCODEC_MAX_AUDIO_FRAME_SIZE * 10)
++, DecodingBuffer(192000 /* AVCODEC_MAX_AUDIO_FRAME_SIZE */ * 10)
+ , Index(Index)
+ {
+ if (Track < 0 || Track >= static_cast<int>(Index.size()))
+@@ -172,7 +172,7 @@
+ uint8_t *Buf = &DecodingBuffer[0];
+ uint8_t *Data = Packet.data;
+ while (Packet.size > 0) {
+- int TempOutputBufSize = AVCODEC_MAX_AUDIO_FRAME_SIZE * 10 -
(Buf - &DecodingBuffer[0]);
++ int TempOutputBufSize = 192000 /* AVCODEC_MAX_AUDIO_FRAME_SIZE
*/ * 10 - (Buf - &DecodingBuffer[0]);
+ int Ret = avcodec_decode_audio3(CodecContext, (int16_t *)Buf,
&TempOutputBufSize, &Packet);
+
+ // Should only ever happen if the user chose to ignore decoding
errors
+--- ffms-2.17-src/src/core/indexing.cpp.orig 2013-07-19 18:09:58.834588184
+0200
++++ ffms-2.17-src/src/core/indexing.cpp 2013-07-19 18:17:18.477903068
+0200
+@@ -587,7 +587,7 @@
+ , ANC(0)
+ , ANCPrivate(0)
+ , SourceFile(Filename)
+-, DecodingBuffer(AVCODEC_MAX_AUDIO_FRAME_SIZE * 10)
++, DecodingBuffer(192000 /* AVCODEC_MAX_AUDIO_FRAME_SIZE */ * 10)
+ {
+ FFMS_Index::CalculateFileSignature(Filename, &Filesize, Digest);
+ }
+@@ -633,7 +633,7 @@
+ int64_t StartSample = Context.CurrentSample;
+ int Read = 0;
+ while (Packet->size > 0) {
+- int dbsize = AVCODEC_MAX_AUDIO_FRAME_SIZE*10;
++ int dbsize = 192000 /* AVCODEC_MAX_AUDIO_FRAME_SIZE */ *10;
+ int Ret = avcodec_decode_audio3(CodecContext, (int16_t
*)&DecodingBuffer[0], &dbsize, Packet);
+ if (Ret < 0) {
+ if (ErrorHandling == FFMS_IEH_ABORT) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpegsource.git/commitdiff/3428a40f21ab5e8864d3d1a16dad84f5cdf0e63f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
