Mina Nagy Zaki b6c5848a1f lavfi: avfilter_merge_formats: handle case where inputs are same ...

This fixes a double-free crash if lists are the same due to the two
merge_ref() calls at the end of the (useless) merging that happens.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 11b6a82412)

Conflicts:

	libavfilter/formats.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit e5f4e24942)

Signed-off-by: Anton Khirnov <anton@khirnov.net>

2012-10-06 09:40:46 +02:00

..

x86

vf_gradfun: relicense x86 asm to LGPL

2011-07-07 16:51:47 +02:00

af_anull.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

allfilters.c

lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

2011-05-07 10:17:40 +02:00

asink_anullsink.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

asrc_anullsrc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avfilter.c

avfilter: Surround function only used in debug mode by appropriate #ifdef.

2011-05-29 13:43:03 +02:00

avfilter.h

multiple inclusion guard cleanup

2011-05-21 13:48:10 +02:00

avfiltergraph.c

avfiltergraph: use meaningful error codes

2012-03-18 17:50:17 +01:00

avfiltergraph.h

multiple inclusion guard cleanup

2011-05-21 13:48:10 +02:00

defaults.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

drawutils.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

drawutils.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

formats.c

lavfi: avfilter_merge_formats: handle case where inputs are same

2012-10-06 09:40:46 +02:00

gradfun.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

graphparser.c

graphparser: add a NULL check on the argument passed to strstr

2011-04-25 22:45:44 +02:00

internal.h

multiple inclusion guard cleanup

2011-05-21 13:48:10 +02:00

libavfilter.v

Add symbol versioning for shared libraries

2010-01-16 04:49:02 +00:00

Makefile

lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

2011-05-07 10:17:40 +02:00

vf_aspect.c

setdar: prefer "sar" over "par" in log info message

2011-04-25 22:45:44 +02:00

vf_blackframe.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_copy.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_crop.c

vf_crop: Replace #ifdef DEBUG + av_log() by av_dlog().

2011-05-29 13:43:02 +02:00

vf_cropdetect.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_drawbox.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_drawtext.c

drawtext: add braces around initialisers for option defaults

2011-06-20 20:54:40 +02:00

vf_fade.c

fade: fix draw_slice() check on fade->factor value

2011-04-25 22:45:44 +02:00

vf_fieldorder.c

Remove unused variables

2011-06-02 20:06:00 +01:00

vf_fifo.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_format.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_frei0r.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_gradfun.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_hflip.c

hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats

2011-04-28 07:25:27 +02:00

vf_hqdn3d.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_libopencv.c

vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h

2011-07-18 12:37:22 +02:00

vf_null.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_overlay.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_pad.c

vf_pad: fix "vsub" variable value computation

2012-02-08 14:38:31 +01:00

vf_pixdesctest.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_scale.c

vf_scale: apply the same transform to the aspect during init that is applied per frame

2012-02-08 14:38:31 +01:00

vf_setpts.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_settb.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_slicify.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_transpose.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_unsharp.c

vf_unsharp: fix out-of-buffer read

2012-02-08 14:38:31 +01:00

vf_vflip.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vf_yadif.c

vf_yadif: correct documentation on the parity parameter

2012-02-08 14:38:27 +01:00

vsink_nullsink.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vsrc_buffer.c

vsrc_buffer: tweak error message in init()

2011-05-24 14:21:20 +02:00

vsrc_buffer.h

vsrc_buffer.h: add file doxy

2011-05-24 14:22:51 +02:00

vsrc_color.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vsrc_movie.c

lavf: add avformat_find_stream_info()

2011-11-19 10:22:27 +01:00

vsrc_nullsrc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

yadif.h

Change yadif to not use out of picture lines.

2011-04-03 08:46:19 +02:00