forked from ports/contrib
ffmpeg: 20080826 -> 0.5
This commit is contained in:
Danny Rawlins
parent
909132afd1
commit
345bd2a119
@ -7,57 +7,54 @@ 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/opt.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/
|
||||
-rw-r--r-- root/root usr/include/libavdevice/avdevice.h
|
||||
drwxr-xr-x root/root usr/include/libavformat/
|
||||
-rw-r--r-- root/root usr/include/libavformat/avformat.h
|
||||
-rw-r--r-- root/root usr/include/libavformat/avio.h
|
||||
-rw-r--r-- root/root usr/include/libavformat/rtsp.h
|
||||
-rw-r--r-- root/root usr/include/libavformat/rtspcodes.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/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/bswap.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/fifo.h
|
||||
-rw-r--r-- root/root usr/include/libavutil/internal.h
|
||||
-rw-r--r-- root/root usr/include/libavutil/intfloat_readwrite.h
|
||||
-rw-r--r-- root/root usr/include/libavutil/intreadwrite.h
|
||||
-rw-r--r-- root/root usr/include/libavutil/log.h
|
||||
-rw-r--r-- root/root usr/include/libavutil/lzo.h
|
||||
-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/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/
|
||||
-rw-r--r-- root/root usr/include/libpostproc/postprocess.h
|
||||
drwxr-xr-x root/root usr/include/libswscale/
|
||||
-rw-r--r-- root/root usr/include/libswscale/rgb2rgb.h
|
||||
-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.51.69.0
|
||||
lrwxrwxrwx root/root usr/lib/libavcodec.so.51 -> libavcodec.so.51.69.0
|
||||
-rwxr-xr-x root/root usr/lib/libavcodec.so.51.69.0
|
||||
lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.52.20.0
|
||||
lrwxrwxrwx root/root usr/lib/libavcodec.so.52 -> libavcodec.so.52.20.0
|
||||
-rwxr-xr-x root/root usr/lib/libavcodec.so.52.20.0
|
||||
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.21.0
|
||||
lrwxrwxrwx root/root usr/lib/libavformat.so.52 -> libavformat.so.52.21.0
|
||||
-rwxr-xr-x root/root usr/lib/libavformat.so.52.21.0
|
||||
lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.49.10.0
|
||||
lrwxrwxrwx root/root usr/lib/libavutil.so.49 -> libavutil.so.49.10.0
|
||||
-rwxr-xr-x root/root usr/lib/libavutil.so.49.10.0
|
||||
lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.51.1.0
|
||||
lrwxrwxrwx root/root usr/lib/libpostproc.so.51 -> libpostproc.so.51.1.0
|
||||
-rwxr-xr-x root/root usr/lib/libpostproc.so.51.1.0
|
||||
lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.0.5.1
|
||||
lrwxrwxrwx root/root usr/lib/libswscale.so.0 -> libswscale.so.0.5.1
|
||||
-rwxr-xr-x root/root usr/lib/libswscale.so.0.5.1
|
||||
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/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
|
||||
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
|
||||
@ -77,3 +74,21 @@ drwxr-xr-x root/root usr/man/man1/
|
||||
-rw-r--r-- root/root usr/man/man1/ffmpeg.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/ffplay.1.gz
|
||||
-rw-r--r-- root/root usr/man/man1/ffserver.1.gz
|
||||
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-fastfirstpass.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-hq.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-ipod320.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-ipod640.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-lossless_fast.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-lossless_max.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-lossless_medium.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-lossless_slow.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-lossless_slower.ffpreset
|
||||
-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-normal.ffpreset
|
||||
-rw-r--r-- root/root usr/share/ffmpeg/libx264-slowfirstpass.ffpreset
|
||||
|
||||
@ -1,3 +1 @@
|
||||
97d3e60b4245903a42d91cfb0b7cbcb0 ffmpeg-20080826-14974-missing-header.patch
|
||||
80ecc64f542516102902150067be1e4b ffmpeg-20080826-14974.tar.bz2
|
||||
a58f8135e58ca23d83443c7263712b80 ffmpeg-x264_fix.patch
|
||||
be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2
|
||||
|
||||
@ -2,26 +2,20 @@
|
||||
# URL: http://ffmpeg.mplayerhq.hu/
|
||||
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com
|
||||
# Packager: Matt Housh, jaeger at crux dot nu
|
||||
# Depends on: amrnb amrwb liba52 faac imlib2 lame libsdl libtheora libxvid x264
|
||||
# Depends on: amrnb amrwb faac imlib2 lame libsdl libtheora libxvid x264
|
||||
|
||||
name=ffmpeg
|
||||
version=20080826
|
||||
release=2
|
||||
source=(http://www.dcaf-security.org/distfiles/$name-$version-14974.tar.bz2
|
||||
ffmpeg-20080826-14974-missing-header.patch
|
||||
ffmpeg-x264_fix.patch)
|
||||
version=0.5
|
||||
release=1
|
||||
source=(http://ffmpeg.org/releases/$name-$version.tar.bz2)
|
||||
|
||||
build() {
|
||||
cd $name
|
||||
patch -p 1 -i $SRC/ffmpeg-20080826-14974-missing-header.patch
|
||||
patch -p 1 -i $SRC/ffmpeg-x264_fix.patch
|
||||
cd $name-$version
|
||||
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
--mandir=/usr/man \
|
||||
--enable-gpl \
|
||||
--enable-liba52 \
|
||||
--enable-liba52bin \
|
||||
--enable-libfaac \
|
||||
--enable-libfaad \
|
||||
--enable-libfaadbin \
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
diff -pruN ffmpeg.orig/libavutil/Makefile ffmpeg/libavutil/Makefile
|
||||
--- ffmpeg.orig/libavutil/Makefile 2008-08-27 00:40:28.026327179 +1000
|
||||
+++ ffmpeg/libavutil/Makefile 2008-08-27 00:49:51.206331526 +1000
|
||||
@@ -28,10 +28,13 @@ HEADERS = adler32.h \
|
||||
avstring.h \
|
||||
avutil.h \
|
||||
base64.h \
|
||||
+ bswap.h \
|
||||
common.h \
|
||||
crc.h \
|
||||
fifo.h \
|
||||
+ internal.h \
|
||||
intfloat_readwrite.h \
|
||||
+ intreadwrite.h \
|
||||
log.h \
|
||||
lzo.h \
|
||||
mathematics.h \
|
||||
@ -1,42 +0,0 @@
|
||||
---
|
||||
libavcodec/libx264.c | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: ffmpeg/libavcodec/libx264.c
|
||||
===================================================================
|
||||
--- ffmpeg.orig/libavcodec/libx264.c
|
||||
+++ ffmpeg/libavcodec/libx264.c
|
||||
@@ -162,7 +162,11 @@ X264_init(AVCodecContext *avctx)
|
||||
|
||||
x4->params.i_bframe = avctx->max_b_frames;
|
||||
x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
|
||||
- x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
|
||||
+#if X264_BUILD < 62
|
||||
+ x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
|
||||
+#else
|
||||
+ x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
|
||||
+#endif
|
||||
x4->params.i_bframe_bias = avctx->bframebias;
|
||||
x4->params.b_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID;
|
||||
avctx->has_b_frames= avctx->flags2 & CODEC_FLAG2_BPYRAMID ? 2 : !!avctx->max_b_frames;
|
||||
@@ -227,8 +231,10 @@ X264_init(AVCodecContext *avctx)
|
||||
x4->params.analyse.i_me_range = avctx->me_range;
|
||||
x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
|
||||
|
||||
+#if X264_BUILD < 65
|
||||
x4->params.analyse.b_bidir_me = avctx->bidir_refine > 0;
|
||||
x4->params.analyse.b_bframe_rdo = avctx->flags2 & CODEC_FLAG2_BRDO;
|
||||
+#endif
|
||||
x4->params.analyse.b_mixed_references =
|
||||
avctx->flags2 & CODEC_FLAG2_MIXED_REFS;
|
||||
x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
|
||||
@@ -253,7 +259,9 @@ X264_init(AVCodecContext *avctx)
|
||||
x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
|
||||
x4->params.rc.f_pb_factor = avctx->b_quant_factor;
|
||||
x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
|
||||
+#if X264_BUILD < 61
|
||||
x4->params.rc.psz_rc_eq = avctx->rc_eq;
|
||||
+#endif
|
||||
|
||||
x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR;
|
||||
x4->params.i_log_level = X264_LOG_DEBUG;
|
||||
Loading…
x
Reference in New Issue
Block a user