diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2004-09-16 17:18:41 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2004-09-16 17:18:41 +0800 |
| commit | 354cb73b91e9c28dfb871e2be706481b8a08089f (patch) | |
| tree | aa4befb9e7c4b6d383c64aa8362065b83c3fde78 /multimedia/libxine | |
| parent | f279162705bee8e83c469b1f979f86dcaf981c7b (diff) | |
| download | freebsd-ports-gnome-354cb73b91e9c28dfb871e2be706481b8a08089f.tar.gz freebsd-ports-gnome-354cb73b91e9c28dfb871e2be706481b8a08089f.tar.zst freebsd-ports-gnome-354cb73b91e9c28dfb871e2be706481b8a08089f.zip | |
Fix breakage of the ffmpeg plugin on 5.3 and -current.
PR: ports/71105
Submitted by: Michael Nottebrock <michaelnottebrock@gmx.net>
Patch submitted by: Henrik Gulbrandsen <henrik.gulbrandsen@telia.com>
Approved by: portmgr (marcus)
Diffstat (limited to 'multimedia/libxine')
| -rw-r--r-- | multimedia/libxine/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpegvideo.c | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 33c0d8870e7d..c1d4c29aca10 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -7,7 +7,7 @@ PORTNAME= xine PORTVERSION= 1.0.r5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpegvideo.c b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpegvideo.c new file mode 100644 index 000000000000..e801a9af4694 --- /dev/null +++ b/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpegvideo.c @@ -0,0 +1,19 @@ +--- src/libffmpeg/libavcodec/mpegvideo.c.orig Sun May 30 21:24:21 2004 ++++ src/libffmpeg/libavcodec/mpegvideo.c Sat Sep 11 23:30:05 2004 +@@ -3926,6 +3926,8 @@ + +sse(s, s->new_picture.data[2] + s->mb_x*8 + s->mb_y*s->uvlinesize*8,s->dest[2], w>>1, h>>1, s->uvlinesize); + } + ++/* xine: do not need this for decode or MPEG-1 encoding modes */ ++#if 0 + static int pre_estimate_motion_thread(AVCodecContext *c, void *arg){ + MpegEncContext *s= arg; + +@@ -3969,6 +3971,7 @@ + } + return 0; + } ++#endif + + static int mb_var_thread(AVCodecContext *c, void *arg){ + MpegEncContext *s= arg; |