4:54 a.m.
Author: oget
Update of /cvs/free/rpms/avbin/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13697
Modified Files:
avbin.spec
Added Files:
avbin-avloglevel.patch avbin-depracated-fncs.patch
Log Message:
* Thu Oct 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-11
- Update to trunk
- Solves rebuild problem against newer ffmpeg (RFBZ #884)
avbin-avloglevel.patch:
--- NEW FILE avbin-avloglevel.patch ---
diff -rupN avbin-20091022svn.old/src/avbin.c avbin-20091022svn/src/avbin.c
--- avbin-20091022svn.old/src/avbin.c 2009-10-22 23:15:06.000000000 -0400
+++ avbin-20091022svn/src/avbin.c 2009-10-22 23:24:07.000000000 -0400
@@ -55,7 +55,7 @@ static void avbin_log_callback(void *ptr
static char message[8192];
const char *module = NULL;
- if (level > av_log_level || !user_log_callback)
+ if (level > av_log_get_level() || !user_log_callback)
return;
if (ptr)
@@ -99,7 +99,7 @@ AVbinResult avbin_init()
AVbinResult avbin_set_log_level(AVbinLogLevel level)
{
- av_log_level = level;
+ av_log_set_level(level);
return AVBIN_RESULT_OK;
}
avbin-depracated-fncs.patch:
--- NEW FILE avbin-depracated-fncs.patch ---
diff -rupN avbin-20091022svn.old/src/avbin.c avbin-20091022svn/src/avbin.c
--- avbin-20091022svn.old/src/avbin.c 2009-10-22 23:15:06.000000000 -0400
+++ avbin-20091022svn/src/avbin.c 2009-10-23 00:45:33.000000000 -0400
@@ -321,9 +321,13 @@ int avbin_decode_audio(AVbinStream *stre
if (stream->type != CODEC_TYPE_AUDIO)
return AVBIN_RESULT_ERROR;
- used = avcodec_decode_audio2(stream->codec_context,
+ AVPacket pkt;
+ av_init_packet(&pkt);
+ pkt.data = data_in;
+ pkt.size = size_in;
+ used = avcodec_decode_audio3(stream->codec_context,
(int16_t *) data_out, size_out,
- data_in, size_in);
+ &pkt);
if (used < 0)
return AVBIN_RESULT_ERROR;
@@ -344,9 +348,13 @@ int avbin_decode_video(AVbinStream *stre
if (stream->type != CODEC_TYPE_VIDEO)
return AVBIN_RESULT_ERROR;
- used = avcodec_decode_video(stream->codec_context,
+ AVPacket pkt;
+ av_init_packet(&pkt);
+ pkt.data = data_in;
+ pkt.size = size_in;
+ used = avcodec_decode_video2(stream->codec_context,
stream->frame, &got_picture,
- data_in, size_in);
+ &pkt);
if (!got_picture)
return AVBIN_RESULT_ERROR;
Index: avbin.spec
===================================================================
RCS file: /cvs/free/rpms/avbin/devel/avbin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- avbin.spec 21 Oct 2009 19:19:24 -0000 1.5
+++ avbin.spec 23 Oct 2009 04:54:51 -0000 1.6
@@ -1,7 +1,7 @@
Summary: Cross-platform media decoding library
Name: avbin
Version: 7
-Release: 10%{?dist}
+Release: 11%{?dist}
# Note that this license is implicitly converted to GPLv3 because we are linking to
# a GPLv2+ ffmpeg:
License: LGPLv3+
@@ -14,6 +14,10 @@
Patch0: avbin-swscale.patch
# SAMPLE_FMT_S24 is deprecated on ffmpeg rev > 16176:
Patch1: avbin-SAMPLE_FMT_S24.patch
+# Fix build against newer ffmpeg
+Patch2: avbin-avloglevel.patch
+# avcodec_decode_{audio2,video} are deprecated in even newer ffmpeg
+Patch3: avbin-depracated-fncs.patch
# The original Makefile links ffmpeg statically. This is the modified
# Makefile that tells the compiler to link dynamically to ffmpeg:
Patch9: avbin-Makefile-shared.patch
@@ -45,9 +49,13 @@
%prep
%setup -q -n %{name}-src-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch9 -p1
+%patch0 -p1 -b .smscale
+%patch1 -p1 -b .FMT_S24
+%if 0%{?fedora} >= 12
+%patch2 -p1 -b .avloglevel
+%patch3 -p1 -b .deprecated
+%endif
+%patch9 -p1 -b .shared
# Fix permissions and end of line encoding issues:
sed 's/\r//' CHANGELOG > CHANGELOG.bak
@@ -94,6 +102,10 @@
%{_libdir}/lib%{name}.so
%changelog
+* Thu Oct 22 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 7-11
+- Update to trunk
+- Solves rebuild problem against newer ffmpeg (RFBZ #884)
+
* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 7-10
- rebuilt