packages: ffmpeg/ffmpeg.spec, ffmpeg/ffmpeg-AV_PICTURE_TYPE_NONE.patch (NEW...

[baggins]

Author: baggins                      Date: Tue Jul 26 20:36:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- added missing enum element

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.219 -> 1.220) , ffmpeg-AV_PICTURE_TYPE_NONE.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.219 packages/ffmpeg/ffmpeg.spec:1.220
--- packages/ffmpeg/ffmpeg.spec:1.219	Sun Jul 24 16:16:10 2011
+++ packages/ffmpeg/ffmpeg.spec	Tue Jul 26 22:36:40 2011
@@ -13,7 +13,7 @@
 Summary(pl.UTF-8):	FFmpeg - szybki konwerter audio/wideo
 Name:		ffmpeg
 Version:	0.8
-Release:	3
+Release:	4
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, xavs, xvid, x11grab)
 # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc)
@@ -26,6 +26,7 @@
 Source3:	ffserver.conf
 Patch0:		%{name}-bug-803.patch
 Patch1:		%{name}-gsm.patch
+Patch2:		%{name}-AV_PICTURE_TYPE_NONE.patch
 URL:		http://www.ffmpeg.org/
 BuildRequires:	SDL-devel
 BuildRequires:	alsa-lib-devel
@@ -224,6 +225,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p0
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -491,6 +493,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220  2011/07/26 20:36:40  baggins
+- rel 4
+- added missing enum element
+
 Revision 1.219  2011/07/24 14:16:10  arekm
 - release 3
 

================================================================
Index: packages/ffmpeg/ffmpeg-AV_PICTURE_TYPE_NONE.patch
diff -u /dev/null packages/ffmpeg/ffmpeg-AV_PICTURE_TYPE_NONE.patch:1.1
--- /dev/null	Tue Jul 26 22:36:46 2011
+++ packages/ffmpeg/ffmpeg-AV_PICTURE_TYPE_NONE.patch	Tue Jul 26 22:36:40 2011
@@ -0,0 +1,12 @@
+--- ffmpeg-0.8/libavutil/avutil.h~	2011-06-21 22:08:33.000000000 +0200
++++ ffmpeg-0.8/libavutil/avutil.h	2011-07-26 22:35:36.646420640 +0200
+@@ -104,7 +104,8 @@
+ #define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
+ 
+ enum AVPictureType {
+-    AV_PICTURE_TYPE_I = 1, ///< Intra
++    AV_PICTURE_TYPE_NONE = 0, ///< Undefined
++    AV_PICTURE_TYPE_I,     ///< Intra
+     AV_PICTURE_TYPE_P,     ///< Predicted
+     AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
+     AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.219&r2=1.220&f=u