summaryrefslogtreecommitdiffstats
path: root/extra/ffmpeg
diff options
context:
space:
mode:
Diffstat (limited to 'extra/ffmpeg')
-rw-r--r--extra/ffmpeg/.footprint.i68667
-rw-r--r--extra/ffmpeg/.footprint.x86_6467
-rw-r--r--extra/ffmpeg/.md5sum.i6862
-rw-r--r--extra/ffmpeg/.md5sum.x86_642
-rw-r--r--extra/ffmpeg/Pkgfile4
5 files changed, 91 insertions, 51 deletions
diff --git a/extra/ffmpeg/.footprint.i686 b/extra/ffmpeg/.footprint.i686
index 176fbf678..1e60f58c7 100644
--- a/extra/ffmpeg/.footprint.i686
+++ b/extra/ffmpeg/.footprint.i686
@@ -2,11 +2,15 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/ffmpeg
-rwxr-xr-x root/root usr/bin/ffplay
+-rwxr-xr-x root/root usr/bin/ffprobe
-rwxr-xr-x root/root usr/bin/ffserver
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/libavcodec/
-rw-r--r-- root/root usr/include/libavcodec/avcodec.h
+-rw-r--r-- root/root usr/include/libavcodec/avfft.h
+-rw-r--r-- root/root usr/include/libavcodec/dxva2.h
-rw-r--r-- root/root usr/include/libavcodec/opt.h
+-rw-r--r-- root/root usr/include/libavcodec/vaapi.h
-rw-r--r-- root/root usr/include/libavcodec/vdpau.h
-rw-r--r-- root/root usr/include/libavcodec/xvmc.h
drwxr-xr-x root/root usr/include/libavdevice/
@@ -16,11 +20,14 @@ drwxr-xr-x root/root usr/include/libavformat/
-rw-r--r-- root/root usr/include/libavformat/avio.h
drwxr-xr-x root/root usr/include/libavutil/
-rw-r--r-- root/root usr/include/libavutil/adler32.h
+-rw-r--r-- root/root usr/include/libavutil/attributes.h
+-rw-r--r-- root/root usr/include/libavutil/avconfig.h
-rw-r--r-- root/root usr/include/libavutil/avstring.h
-rw-r--r-- root/root usr/include/libavutil/avutil.h
-rw-r--r-- root/root usr/include/libavutil/base64.h
-rw-r--r-- root/root usr/include/libavutil/common.h
-rw-r--r-- root/root usr/include/libavutil/crc.h
+-rw-r--r-- root/root usr/include/libavutil/error.h
-rw-r--r-- root/root usr/include/libavutil/fifo.h
-rw-r--r-- root/root usr/include/libavutil/intfloat_readwrite.h
-rw-r--r-- root/root usr/include/libavutil/log.h
@@ -28,8 +35,8 @@ drwxr-xr-x root/root usr/include/libavutil/
-rw-r--r-- root/root usr/include/libavutil/mathematics.h
-rw-r--r-- root/root usr/include/libavutil/md5.h
-rw-r--r-- root/root usr/include/libavutil/mem.h
+-rw-r--r-- root/root usr/include/libavutil/pixdesc.h
-rw-r--r-- root/root usr/include/libavutil/pixfmt.h
--rw-r--r-- root/root usr/include/libavutil/random.h
-rw-r--r-- root/root usr/include/libavutil/rational.h
-rw-r--r-- root/root usr/include/libavutil/sha1.h
drwxr-xr-x root/root usr/include/libpostproc/
@@ -37,24 +44,24 @@ drwxr-xr-x root/root usr/include/libpostproc/
drwxr-xr-x root/root usr/include/libswscale/
-rw-r--r-- root/root usr/include/libswscale/swscale.h
drwxr-xr-x root/root usr/lib/
-lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.52.20.1
-lrwxrwxrwx root/root usr/lib/libavcodec.so.52 -> libavcodec.so.52.20.1
--rwxr-xr-x root/root usr/lib/libavcodec.so.52.20.1
-lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.52.1.0
-lrwxrwxrwx root/root usr/lib/libavdevice.so.52 -> libavdevice.so.52.1.0
--rwxr-xr-x root/root usr/lib/libavdevice.so.52.1.0
-lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.52.31.0
-lrwxrwxrwx root/root usr/lib/libavformat.so.52 -> libavformat.so.52.31.0
--rwxr-xr-x root/root usr/lib/libavformat.so.52.31.0
-lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.49.15.0
-lrwxrwxrwx root/root usr/lib/libavutil.so.49 -> libavutil.so.49.15.0
--rwxr-xr-x root/root usr/lib/libavutil.so.49.15.0
+lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.52.72.2
+lrwxrwxrwx root/root usr/lib/libavcodec.so.52 -> libavcodec.so.52.72.2
+-rwxr-xr-x root/root usr/lib/libavcodec.so.52.72.2
+lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.52.2.0
+lrwxrwxrwx root/root usr/lib/libavdevice.so.52 -> libavdevice.so.52.2.0
+-rwxr-xr-x root/root usr/lib/libavdevice.so.52.2.0
+lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.52.64.2
+lrwxrwxrwx root/root usr/lib/libavformat.so.52 -> libavformat.so.52.64.2
+-rwxr-xr-x root/root usr/lib/libavformat.so.52.64.2
+lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.50.15.1
+lrwxrwxrwx root/root usr/lib/libavutil.so.50 -> libavutil.so.50.15.1
+-rwxr-xr-x root/root usr/lib/libavutil.so.50.15.1
lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.51.2.0
lrwxrwxrwx root/root usr/lib/libpostproc.so.51 -> libpostproc.so.51.2.0
-rwxr-xr-x root/root usr/lib/libpostproc.so.51.2.0
-lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.0.7.1
-lrwxrwxrwx root/root usr/lib/libswscale.so.0 -> libswscale.so.0.7.1
--rwxr-xr-x root/root usr/lib/libswscale.so.0.7.1
+lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.0.11.0
+lrwxrwxrwx root/root usr/lib/libswscale.so.0 -> libswscale.so.0.11.0
+-rwxr-xr-x root/root usr/lib/libswscale.so.0.11.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libavcodec.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libavdevice.pc
@@ -62,17 +69,14 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libavutil.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libpostproc.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libswscale.pc
-drwxr-xr-x root/root usr/lib/vhook/
--rwxr-xr-x root/root usr/lib/vhook/drawtext.so
--rwxr-xr-x root/root usr/lib/vhook/fish.so
--rwxr-xr-x root/root usr/lib/vhook/imlib2.so
--rwxr-xr-x root/root usr/lib/vhook/null.so
--rwxr-xr-x root/root usr/lib/vhook/ppm.so
--rwxr-xr-x root/root usr/lib/vhook/watermark.so
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/ffmpeg/
-rw-r--r-- root/root usr/share/ffmpeg/libx264-baseline.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-default.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-fast.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-fast_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-faster.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-faster_firstpass.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-fastfirstpass.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-hq.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-ipod320.ffpreset
@@ -85,10 +89,27 @@ drwxr-xr-x root/root usr/share/ffmpeg/
-rw-r--r-- root/root usr/share/ffmpeg/libx264-lossless_ultrafast.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-main.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-max.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-medium.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-medium_firstpass.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-normal.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-placebo.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-placebo_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-slow.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-slow_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-slower.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-slower_firstpass.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-slowfirstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-superfast.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-superfast_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-ultrafast.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-ultrafast_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-veryfast.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-veryfast_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-veryslow.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-veryslow_firstpass.ffpreset
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/ffmpeg.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffplay.1.gz
+-rw-r--r-- root/root usr/share/man/man1/ffprobe.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffserver.1.gz
diff --git a/extra/ffmpeg/.footprint.x86_64 b/extra/ffmpeg/.footprint.x86_64
index 176fbf678..1e60f58c7 100644
--- a/extra/ffmpeg/.footprint.x86_64
+++ b/extra/ffmpeg/.footprint.x86_64
@@ -2,11 +2,15 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/ffmpeg
-rwxr-xr-x root/root usr/bin/ffplay
+-rwxr-xr-x root/root usr/bin/ffprobe
-rwxr-xr-x root/root usr/bin/ffserver
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/libavcodec/
-rw-r--r-- root/root usr/include/libavcodec/avcodec.h
+-rw-r--r-- root/root usr/include/libavcodec/avfft.h
+-rw-r--r-- root/root usr/include/libavcodec/dxva2.h
-rw-r--r-- root/root usr/include/libavcodec/opt.h
+-rw-r--r-- root/root usr/include/libavcodec/vaapi.h
-rw-r--r-- root/root usr/include/libavcodec/vdpau.h
-rw-r--r-- root/root usr/include/libavcodec/xvmc.h
drwxr-xr-x root/root usr/include/libavdevice/
@@ -16,11 +20,14 @@ drwxr-xr-x root/root usr/include/libavformat/
-rw-r--r-- root/root usr/include/libavformat/avio.h
drwxr-xr-x root/root usr/include/libavutil/
-rw-r--r-- root/root usr/include/libavutil/adler32.h
+-rw-r--r-- root/root usr/include/libavutil/attributes.h
+-rw-r--r-- root/root usr/include/libavutil/avconfig.h
-rw-r--r-- root/root usr/include/libavutil/avstring.h
-rw-r--r-- root/root usr/include/libavutil/avutil.h
-rw-r--r-- root/root usr/include/libavutil/base64.h
-rw-r--r-- root/root usr/include/libavutil/common.h
-rw-r--r-- root/root usr/include/libavutil/crc.h
+-rw-r--r-- root/root usr/include/libavutil/error.h
-rw-r--r-- root/root usr/include/libavutil/fifo.h
-rw-r--r-- root/root usr/include/libavutil/intfloat_readwrite.h
-rw-r--r-- root/root usr/include/libavutil/log.h
@@ -28,8 +35,8 @@ drwxr-xr-x root/root usr/include/libavutil/
-rw-r--r-- root/root usr/include/libavutil/mathematics.h
-rw-r--r-- root/root usr/include/libavutil/md5.h
-rw-r--r-- root/root usr/include/libavutil/mem.h
+-rw-r--r-- root/root usr/include/libavutil/pixdesc.h
-rw-r--r-- root/root usr/include/libavutil/pixfmt.h
--rw-r--r-- root/root usr/include/libavutil/random.h
-rw-r--r-- root/root usr/include/libavutil/rational.h
-rw-r--r-- root/root usr/include/libavutil/sha1.h
drwxr-xr-x root/root usr/include/libpostproc/
@@ -37,24 +44,24 @@ drwxr-xr-x root/root usr/include/libpostproc/
drwxr-xr-x root/root usr/include/libswscale/
-rw-r--r-- root/root usr/include/libswscale/swscale.h
drwxr-xr-x root/root usr/lib/
-lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.52.20.1
-lrwxrwxrwx root/root usr/lib/libavcodec.so.52 -> libavcodec.so.52.20.1
--rwxr-xr-x root/root usr/lib/libavcodec.so.52.20.1
-lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.52.1.0
-lrwxrwxrwx root/root usr/lib/libavdevice.so.52 -> libavdevice.so.52.1.0
--rwxr-xr-x root/root usr/lib/libavdevice.so.52.1.0
-lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.52.31.0
-lrwxrwxrwx root/root usr/lib/libavformat.so.52 -> libavformat.so.52.31.0
--rwxr-xr-x root/root usr/lib/libavformat.so.52.31.0
-lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.49.15.0
-lrwxrwxrwx root/root usr/lib/libavutil.so.49 -> libavutil.so.49.15.0
--rwxr-xr-x root/root usr/lib/libavutil.so.49.15.0
+lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.52.72.2
+lrwxrwxrwx root/root usr/lib/libavcodec.so.52 -> libavcodec.so.52.72.2
+-rwxr-xr-x root/root usr/lib/libavcodec.so.52.72.2
+lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.52.2.0
+lrwxrwxrwx root/root usr/lib/libavdevice.so.52 -> libavdevice.so.52.2.0
+-rwxr-xr-x root/root usr/lib/libavdevice.so.52.2.0
+lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.52.64.2
+lrwxrwxrwx root/root usr/lib/libavformat.so.52 -> libavformat.so.52.64.2
+-rwxr-xr-x root/root usr/lib/libavformat.so.52.64.2
+lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.50.15.1
+lrwxrwxrwx root/root usr/lib/libavutil.so.50 -> libavutil.so.50.15.1
+-rwxr-xr-x root/root usr/lib/libavutil.so.50.15.1
lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.51.2.0
lrwxrwxrwx root/root usr/lib/libpostproc.so.51 -> libpostproc.so.51.2.0
-rwxr-xr-x root/root usr/lib/libpostproc.so.51.2.0
-lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.0.7.1
-lrwxrwxrwx root/root usr/lib/libswscale.so.0 -> libswscale.so.0.7.1
--rwxr-xr-x root/root usr/lib/libswscale.so.0.7.1
+lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.0.11.0
+lrwxrwxrwx root/root usr/lib/libswscale.so.0 -> libswscale.so.0.11.0
+-rwxr-xr-x root/root usr/lib/libswscale.so.0.11.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libavcodec.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libavdevice.pc
@@ -62,17 +69,14 @@ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libavutil.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libpostproc.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libswscale.pc
-drwxr-xr-x root/root usr/lib/vhook/
--rwxr-xr-x root/root usr/lib/vhook/drawtext.so
--rwxr-xr-x root/root usr/lib/vhook/fish.so
--rwxr-xr-x root/root usr/lib/vhook/imlib2.so
--rwxr-xr-x root/root usr/lib/vhook/null.so
--rwxr-xr-x root/root usr/lib/vhook/ppm.so
--rwxr-xr-x root/root usr/lib/vhook/watermark.so
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/ffmpeg/
-rw-r--r-- root/root usr/share/ffmpeg/libx264-baseline.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-default.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-fast.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-fast_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-faster.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-faster_firstpass.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-fastfirstpass.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-hq.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-ipod320.ffpreset
@@ -85,10 +89,27 @@ drwxr-xr-x root/root usr/share/ffmpeg/
-rw-r--r-- root/root usr/share/ffmpeg/libx264-lossless_ultrafast.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-main.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-max.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-medium.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-medium_firstpass.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-normal.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-placebo.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-placebo_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-slow.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-slow_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-slower.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-slower_firstpass.ffpreset
-rw-r--r-- root/root usr/share/ffmpeg/libx264-slowfirstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-superfast.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-superfast_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-ultrafast.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-ultrafast_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-veryfast.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-veryfast_firstpass.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-veryslow.ffpreset
+-rw-r--r-- root/root usr/share/ffmpeg/libx264-veryslow_firstpass.ffpreset
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/ffmpeg.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffplay.1.gz
+-rw-r--r-- root/root usr/share/man/man1/ffprobe.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffserver.1.gz
diff --git a/extra/ffmpeg/.md5sum.i686 b/extra/ffmpeg/.md5sum.i686
index ac573489b..293c3fbd3 100644
--- a/extra/ffmpeg/.md5sum.i686
+++ b/extra/ffmpeg/.md5sum.i686
@@ -1 +1 @@
-c7b0e1729f7aafb10496d79bb963bb26 ffmpeg-0.5.1.tar.bz2
+4f5d732d25eedfb072251b5314ba2093 ffmpeg-0.6.1.tar.bz2
diff --git a/extra/ffmpeg/.md5sum.x86_64 b/extra/ffmpeg/.md5sum.x86_64
index ac573489b..293c3fbd3 100644
--- a/extra/ffmpeg/.md5sum.x86_64
+++ b/extra/ffmpeg/.md5sum.x86_64
@@ -1 +1 @@
-c7b0e1729f7aafb10496d79bb963bb26 ffmpeg-0.5.1.tar.bz2
+4f5d732d25eedfb072251b5314ba2093 ffmpeg-0.6.1.tar.bz2
diff --git a/extra/ffmpeg/Pkgfile b/extra/ffmpeg/Pkgfile
index 8699d67f6..b1b05e2c1 100644
--- a/extra/ffmpeg/Pkgfile
+++ b/extra/ffmpeg/Pkgfile
@@ -7,7 +7,7 @@
name=ffmpeg
-version=0.5.1
+version=0.6.1
release=1
source=(http://ffmpeg.org/releases/$name-$version.tar.bz2)
@@ -30,8 +30,6 @@ build() {
--enable-postproc \
--enable-swscale \
--enable-x11grab \
- --enable-libamr-nb \
- --enable-libamr-wb \
--enable-nonfree \
--disable-debug \
--disable-static