From 164af57ab20baccae5fffc5689d9e6c547cbbc31 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 14 Apr 2013 09:13:54 +0000
Subject: Update to 1.2

---
 ffmpeg/build/ffmpeg.SlackBuild | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'ffmpeg/build/ffmpeg.SlackBuild')

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 401c6fc3..7ece6697 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -127,6 +127,8 @@
 # 1.1.2-1:    13/feb/2013 by Eric Hameleers <alien@slackware.com>
 #             * Update. Also updated many internal libraries.
 #               Added ogg opus decoder.
+# 1.2-1:      13/apr/2013 by Eric Hameleers <alien@slackware.com>
+#             * Update.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -151,7 +153,7 @@ USE_PATENTS=${USE_PATENTS:-"YES"}
 USE_PATENTS=$(echo $USE_PATENTS | tr 'a-z' 'A-Z')
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-1.1.2}
+VERSION=${VERSION:-1.2}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
@@ -203,7 +205,7 @@ SCHROEDINGER=1.0.11
 SPEEX=1.2rc1
 V4L=0.9.3
 VPX=v1.1.0
-X264=20130212-2245      # Needs yasm installed
+X264=20130412-2245      # Needs yasm installed
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -1377,8 +1379,8 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
   ${USE_PATENTED} \
   --enable-gpl \
   --enable-version3 \
-  --enable-postproc \
   --enable-avfilter \
+  --enable-avresample \
   --enable-libass \
   --enable-libdc1394 \
   --enable-libgsm \
@@ -1394,6 +1396,7 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
   --enable-libvorbis \
   --enable-libvpx \
   --enable-libx264 \
+  --enable-postproc \
   --enable-runtime-cpudetect \
   --enable-vaapi \
   --disable-vdpau \
-- 
cgit v1.2.3-65-gdbad