Remove a patch that was only necessary for older snaps of x264.

ok jakemsr@
This commit is contained in:
brad 2008-07-22 20:25:17 +00:00
parent 57f2cafc36
commit 5271e7ed3d
2 changed files with 3 additions and 17 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.36 2008/07/09 01:57:44 jakemsr Exp $
# $OpenBSD: Makefile,v 1.37 2008/07/22 20:25:17 brad Exp $
COMMENT= audio/video converter and streamer with bktr(4) support
V= 20080620
DISTNAME= ffmpeg-svn-${V}
PKGNAME= ffmpeg-${V}
PKGNAME= ffmpeg-${V}p0
SHARED_LIBS= avutil 6.0 \
avcodec 12.0 \
avformat 12.0 \
@ -33,7 +33,7 @@ LIB_DEPENDS= SDL.>=4::devel/sdl \
mp3lame.>=0.1::audio/lame \
vorbis.>=4.0,vorbisenc.>=2.0::audio/libvorbis \
a52::audio/liba52 \
x264::multimedia/x264 \
x264.>=1::multimedia/x264 \
theora::multimedia/libtheora \
Imlib2::graphics/imlib2 \
bz2.>=10::archivers/bzip2

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libavcodec_libx264_c,v 1.1 2008/07/09 01:57:44 jakemsr Exp $
--- libavcodec/libx264.c.orig Sat Jun 21 01:44:41 2008
+++ libavcodec/libx264.c Sat Jun 21 01:45:02 2008
@@ -220,8 +220,8 @@ X264_init(AVCodecContext *avctx)
x4->params.analyse.i_me_method = X264_ME_UMH;
else if(avctx->me_method == ME_FULL)
x4->params.analyse.i_me_method = X264_ME_ESA;
- else if(avctx->me_method == ME_TESA)
- x4->params.analyse.i_me_method = X264_ME_TESA;
+// else if(avctx->me_method == ME_TESA)
+// x4->params.analyse.i_me_method = X264_ME_TESA;
else x4->params.analyse.i_me_method = X264_ME_HEX;
x4->params.analyse.i_me_range = avctx->me_range;