- updated to 0.8.1

- removed obsolete AV_PICTURE_TYPE_NONE patch

Changed files:
    ffmpeg-AV_PICTURE_TYPE_NONE.patch -> 1.2
    ffmpeg.spec -> 1.222

diff --git a/ffmpeg-AV_PICTURE_TYPE_NONE.patch b/ffmpeg-AV_PICTURE_TYPE_NONE.patch
deleted file mode 100644 (file)
index c3e6227..0000000
--- a/ffmpeg-AV_PICTURE_TYPE_NONE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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 27ddc5477a19dca5e0d74c602fa66aae8df7ed89..796f82acac0829d46ac4b47d58d70425e26934ca 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -11,21 +11,20 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       0.8
-Release:       5
+Version:       0.8.1
+Release:       1
 # 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)
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
-# Source0-md5: 7e9b8c8a6952de0c477027e48249f3ed
+# Source0-md5: e9c497e221b5594df477bcbf318f4bce
 Source1:       ffserver.init
 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
@@ -224,7 +223,6 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch2 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig