Attachment #72799 for bug #112374

View | Details | Raw Unified | Return to bug 112374
Collapse All | Expand All




echocheck "external liblzo support"
if test "$_liblzo" = auto ; then
  _liblzo=no
  _liblzo_include="-I/usr/include/lzo"
  cat > $TMPC << EOF
#include <lzo1x.h>
int main(void) { lzo_init();return 0; }
EOF
  cc_check $_liblzo_include -llzo2 && _liblzo=yes
fi
if test "$_liblzo" = yes ; then
  _def_liblzo='#define USE_LIBLZO 1'
  _ld_liblzo='-llzo2'
  _liblzo_include="-I/usr/include/lzo"
  _codecmodules="liblzo $_codecmodules"
else
  _def_liblzo='#undef USE_LIBLZO'

FRIBIDI_INC = $_inc_fribidi
FRIBIDI_LIB = $_ld_fribidi
LIBLZO_LIB= $_ld_liblzo
LIBLZO_INC=$_liblzo_include
MAD_LIB = $_ld_mad
VORBIS_LIB = $_ld_vorbis $_ld_libdv
THEORA_LIB = $_ld_theora

Lines 35-41 Link Here

(-)Makefile.orig (-1 / +1 lines)
35	CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)	35	CODEC_LIBS = $(AV_LIB) $(FAME_LIB) $(MAD_LIB) $(VORBIS_LIB) $(THEORA_LIB) $(FAAD_LIB) $(LIBLZO_LIB) $(DECORE_LIB) $(XVID_LIB) $(DTS_LIB) $(PNG_LIB) $(Z_LIB) $(JPEG_LIB) $(ALSA_LIB) $(XMMS_LIB) $(X264_LIB)
36	COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)	36	COMMON_LIBS = libmpcodecs/libmpcodecs.a $(W32_LIB) $(DS_LIB) libaf/libaf.a libmpdemux/libmpdemux.a input/libinput.a postproc/libswscale.a osdep/libosdep.a $(DVDREAD_LIB) $(CODEC_LIBS) $(FREETYPE_LIB) $(TERMCAP_LIB) $(CDPARANOIA_LIB) $(MPLAYER_NETWORK_LIB) $(WIN32_LIB) $(GIF_LIB) $(MACOSX_FRAMEWORKS) $(SMBSUPPORT_LIB) $(FRIBIDI_LIB) $(FONTCONFIG_LIB) $(ENCA_LIB)
37		37
38	CFLAGS = $(OPTFLAGS) -I. $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall	38	CFLAGS = $(OPTFLAGS) -I. $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(LIBLZO_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) $(CACA_INC) # -Wall
39	ifeq ($(TOOLAME),yes)	39	ifeq ($(TOOLAME),yes)
40	CFLAGS += $(TOOLAME_EXTRAFLAGS)	40	CFLAGS += $(TOOLAME_EXTRAFLAGS)
41	CODEC_LIBS += $(TOOLAME_LIB)	41	CODEC_LIBS += $(TOOLAME_LIB)

Lines 50-56 Link Here

(-)libmpcodecs/Makefile.orig (-1 / +1 lines)
50	SRCS2=$(ENCODER_SRCS)	50	SRCS2=$(ENCODER_SRCS)
51	OBJS2=$(SRCS2:.c=.o)	51	OBJS2=$(SRCS2:.c=.o)
52		52
53	CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) -D_GNU_SOURCE	53	CFLAGS = $(OPTFLAGS) -I. -Inative -I.. -I../libmpdemux -I../loader $(EXTRA_INC) $(X264_INC) $(LIBLZO_INC) -D_GNU_SOURCE
54		54
55	.SUFFIXES: .c .o	55	.SUFFIXES: .c .o
56		56

Lines 37-43 Link Here

(-)libmpdemux/Makefile.orig (-1 / +1 lines)
37	OBJS = $(SRCS:.c=.o)	37	OBJS = $(SRCS:.c=.o)
38	OBJS += $(CPLUSPLUSSRCS:.cpp=.o)	38	OBJS += $(CPLUSPLUSSRCS:.cpp=.o)
39	INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)	39	INCLUDE = -I.. -I../loader $(CSS_INC) $(EXTRA_INC) $(LIBAV_INC)
40	CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC)	40	CFLAGS = $(OPTFLAGS) $(INCLUDE) $(XMMS_CFLAGS) $(CDPARANOIA_INC) $(DVB_INC) $(LIBLZO_INC)
41	CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE)	41	CPLUSPLUSFLAGS = $(CFLAGS) $(CPLUSPLUSINCLUDE)
42	CPLUSPLUS = $(CC)	42	CPLUSPLUS = $(CC)
43		43




#include <lzo1x.h>
#else
#include "native/minilzo.h"
#define lzo_malloc malloc
#define lzo_free free
#endif

#define MOD_NAME "DecLZO"

    priv->codec = -1;
    sh->context = priv;

    priv->wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);

    if (priv->wrkmem == NULL) {
	mp_msg (MSGT_DECVIDEO, MSGL_ERR, "[%s] Cannot alloc work memory\n", MOD_NAME);

    if (priv)
    {
	if (priv->wrkmem)
	    free(priv->wrkmem);
	free(priv);
    }


	
	// decompress one frame to see if its
	// either YV12 or RGB24
	if (!tmp) tmp = malloc(sh->bih->biSizeImage);

	mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] 2 depth %d, format %d data %p len (%d) (%d)\n",
	    MOD_NAME, sh->bih->biBitCount, sh->format, data, len, sh->bih->biSizeImage

Return to bug 112374

Lines 5096-5110 Link Here

(-)configure.orig (-2 / +5 lines)
5096	echocheck "external liblzo support"	5096	echocheck "external liblzo support"
5097	if test "$_liblzo" = auto ; then	5097	if test "$_liblzo" = auto ; then
5098	_liblzo=no	5098	_liblzo=no
		5099	_liblzo_include="-I/usr/include/lzo"
5099	cat > $TMPC << EOF	5100	cat > $TMPC << EOF
5100	#include <lzo1x.h>	5101	#include <lzo1x.h>
5101	int main(void) { lzo_init();return 0; }	5102	int main(void) { lzo_init();return 0; }
5102	EOF	5103	EOF
5103	cc_check -llzo && _liblzo=yes	5104	cc_check $_liblzo_include -llzo2 && _liblzo=yes
5104	fi	5105	fi
5105	if test "$_liblzo" = yes ; then	5106	if test "$_liblzo" = yes ; then
5106	_def_liblzo='#define USE_LIBLZO 1'	5107	_def_liblzo='#define USE_LIBLZO 1'
5107	_ld_liblzo='-llzo'	5108	_ld_liblzo='-llzo2'
		5109	_liblzo_include="-I/usr/include/lzo"
5108	_codecmodules="liblzo $_codecmodules"	5110	_codecmodules="liblzo $_codecmodules"
5109	else	5111	else
5110	_def_liblzo='#undef USE_LIBLZO'	5112	_def_liblzo='#undef USE_LIBLZO'
Lines 6830-6835 Link Here
6830	FRIBIDI_INC = $_inc_fribidi	6832	FRIBIDI_INC = $_inc_fribidi
6831	FRIBIDI_LIB = $_ld_fribidi	6833	FRIBIDI_LIB = $_ld_fribidi
6832	LIBLZO_LIB= $_ld_liblzo	6834	LIBLZO_LIB= $_ld_liblzo
		6835	LIBLZO_INC=$_liblzo_include
6833	MAD_LIB = $_ld_mad	6836	MAD_LIB = $_ld_mad
6834	VORBIS_LIB = $_ld_vorbis $_ld_libdv	6837	VORBIS_LIB = $_ld_vorbis $_ld_libdv
6835	THEORA_LIB = $_ld_theora	6838	THEORA_LIB = $_ld_theora

Lines 10-17 Link Here

(-)./libmpcodecs/vd_lzo.c.orig (-5 / +3 lines)
10	#include <lzo1x.h>	10	#include <lzo1x.h>
11	#else	11	#else
12	#include "native/minilzo.h"	12	#include "native/minilzo.h"
13	#define lzo_malloc malloc
14	#define lzo_free free
15	#endif	13	#endif
16		14
17	#define MOD_NAME "DecLZO"	15	#define MOD_NAME "DecLZO"
Lines 66-72 Link Here
66	priv->codec = -1;	64	priv->codec = -1;
67	sh->context = priv;	65	sh->context = priv;
68		66
69	priv->wrkmem = (lzo_bytep) lzo_malloc(LZO1X_1_MEM_COMPRESS);	67	priv->wrkmem = (lzo_bytep) malloc(LZO1X_1_MEM_COMPRESS);
70		68
71	if (priv->wrkmem == NULL) {	69	if (priv->wrkmem == NULL) {
72	mp_msg (MSGT_DECVIDEO, MSGL_ERR, "[%s] Cannot alloc work memory\n", MOD_NAME);	70	mp_msg (MSGT_DECVIDEO, MSGL_ERR, "[%s] Cannot alloc work memory\n", MOD_NAME);
Lines 84-90 Link Here
84	if (priv)	82	if (priv)
85	{	83	{
86	if (priv->wrkmem)	84	if (priv->wrkmem)
87	lzo_free(priv->wrkmem);	85	free(priv->wrkmem);
88	free(priv);	86	free(priv);
89	}	87	}
90		88
Lines 112-118 Link Here
112		110
113	// decompress one frame to see if its	111	// decompress one frame to see if its
114	// either YV12 or RGB24	112	// either YV12 or RGB24
115	if (!tmp) tmp = lzo_malloc(sh->bih->biSizeImage);	113	if (!tmp) tmp = malloc(sh->bih->biSizeImage);
116		114
117	mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] 2 depth %d, format %d data %p len (%d) (%d)\n",	115	mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] 2 depth %d, format %d data %p len (%d) (%d)\n",
118	MOD_NAME, sh->bih->biBitCount, sh->format, data, len, sh->bih->biSizeImage	116	MOD_NAME, sh->bih->biBitCount, sh->format, data, len, sh->bih->biSizeImage