Project

General

Profile

Bug #3261 » tvh-fix-avfilters-staticbuild.patch

Manuel Lauss, 2015-11-03 22:07

View differences:

Makefile
65 65
LDFLAGS_FFDIR = ${ROOTDIR}/libav_static/build/ffmpeg/lib
66 66
LDFLAGS += ${LDFLAGS_FFDIR}/libavresample.a
67 67
LDFLAGS += ${LDFLAGS_FFDIR}/libswresample.a
68
LDFLAGS += ${LDFLAGS_FFDIR}/libswscale.a
68 69
LDFLAGS += ${LDFLAGS_FFDIR}/libavfilter.a
69 70
LDFLAGS += ${LDFLAGS_FFDIR}/libavutil.a
70 71
LDFLAGS += ${LDFLAGS_FFDIR}/libavformat.a
Makefile.ffmpeg
62 62
FFMPEG_SHA1     = 95046cd9251b69c61b11ebcd1e163ac14d0fc2c6
63 63

  
64 64
EXTLIBS         = libx264 libvorbis libvpx
65
COMPONENTS      = avutil avformat avcodec swresample avfilter avresample
65
COMPONENTS      = avutil avformat avcodec swresample swscale avfilter avresample
66 66
PROTOCOLS       = file
67 67
DECODERS        = mpeg2video mp2 ac3 eac3 h264 h264_vdpau hevc aac aac_latm vorbis libvorbis
68 68
ENCODERS        = mpeg2video mp2 libx264 libvpx_vp8 libvpx_vp9 aac libaacplus vorbis libvorbis
69 69
MUXERS          = mpegts mpeg2dvd matroska webm
70 70
BSFS            = h264_mp4toannexb hevc_mp4toannexb
71
FILTERS	        = yadif scale
71 72

  
72 73
LIBOGG          = libogg-1.3.2
73 74
LIBOGG_TB       = $(LIBOGG).tar.gz
......
370 371
		$(foreach decoder,$(DECODERS),--enable-decoder=$(decoder)) \
371 372
		$(foreach encoder,$(ENCODERS),--enable-encoder=$(encoder)) \
372 373
		$(foreach muxer,$(MUXERS),--enable-muxer=$(muxer)) \
373
		$(foreach bsf,$(BSFS),--enable-bsf=$(bsf))
374
		$(foreach bsf,$(BSFS),--enable-bsf=$(bsf)) \
375
		$(foreach filter,$(FILTERS),--enable-filter=$(filter))
374 376
	DESTDIR=$(LIBAVDIR)/build \
375 377
		$(MAKE) -C $(LIBAVDIR)/$(FFMPEG) install
376 378
	@touch $@
src/main.c
334 334
tasklet_t *
335 335
tasklet_arm_alloc(tsk_callback_t *callback, void *opaque)
336 336
{
337
  tasklet_t *tsk = calloc(1, sizeof(*tsk));
337
  tasklet_t *tsk = malloc(sizeof(*tsk)); /* make LTO happy */
338 338
  if (tsk) {
339 339
    tsk->tsk_allocated = 1;
340 340
    tasklet_arm(tsk, callback, opaque);
(2-2/3)