- rel 4

- added missing enum element

Changed files:
    ffmpeg-AV_PICTURE_TYPE_NONE.patch -> 1.1
    ffmpeg.spec -> 1.220

diff --git a/ffmpeg-AV_PICTURE_TYPE_NONE.patch b/ffmpeg-AV_PICTURE_TYPE_NONE.patch
new file mode 100644 (file)
index 0000000..c3e6227
--- /dev/null
+++ b/ffmpeg-AV_PICTURE_TYPE_NONE.patch
@@ -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

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 4ec242693c456697eb33b0bc2b949fbbfdf91531..2ba7999e239412dfb6a6a78b9ce142a57f54a982 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -12,7 +12,7 @@ Summary:      FFmpeg - a very fast video and audio converter
 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)
@@ -25,6 +25,7 @@ Source2:      ffserver.sysconfig
 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
@@ -223,6 +224,7 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %setup -q
 %patch0 -p1
 %patch1 -p0
+%patch2 -p0
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig