Mina Nagy Zaki e5f4e24942 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 11b6a82412bcd372adf694a26d83b07d337e1325)

Conflicts:

	libavfilter/formats.c

Signed-off-by: Reinhard Tartler <siretart@tauware.de>

2012-10-06 08:43:43 +02:00

..

x86

vf_gradfun: relicense x86 asm to LGPL

2011-07-04 00:01:47 +00:00

af_anull.c

Replace FFmpeg with Libav in licence headers

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

allfilters.c

allfilters: fix type of avfilter_vsrc_buffer.

2011-12-23 08:17:22 +01:00

asink_anullsink.c

Replace FFmpeg with Libav in licence headers

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

asrc_anullsrc.c

Make channel layout masks unsigned

2011-11-25 13:19:54 +00:00

avfilter.c

lavfi: add avfilter_copy_frame_props()

2011-12-25 16:18:57 +01:00

avfilter.h

lavfi: move version macros to a new installed header version.h

2012-01-12 09:00:54 +01:00

avfiltergraph.c

lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

2011-09-28 08:02:53 +02:00

avfiltergraph.h

lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

2011-09-28 08:02:53 +02:00

buffersrc.h

lavfi: add a new function av_buffersrc_buffer().

2011-12-25 16:18:57 +01:00

defaults.c

Make channel layout masks unsigned

2011-11-25 13:19:54 +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 08:43:43 +02:00

gradfun.h

Replace FFmpeg with Libav in licence headers

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

graphparser.c

lavfi: fix signature for avfilter_graph_parse() and avfilter_graph_config()

2011-09-28 08:02:53 +02:00

internal.h

lavfi: add LUT (LookUp Table) generic filters

2011-10-17 18:05:38 +02:00

libavfilter.v

Add symbol versioning for shared libraries

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

Makefile

lavfi: move version macros to a new installed header version.h

2012-01-12 09:00:54 +01:00

version.h

lavfi: move version macros to a new installed header version.h

2012-01-12 09:00:54 +01:00

vf_aspect.c

Do not include mathematics.h in avutil.h

2011-07-03 21:42:06 +01:00

vf_blackframe.c

Replace FFmpeg with Libav in licence headers

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

vf_boxblur.c

lavfi: port boxblur filter from libmpcodecs

2011-10-17 18:05:41 +02:00

vf_copy.c

Replace FFmpeg with Libav in licence headers

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

vf_crop.c

Do not include mathematics.h in avutil.h

2011-07-03 21:42:06 +01:00

vf_cropdetect.c

Replace FFmpeg with Libav in licence headers

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

vf_delogo.c

lavfi: port libmpcodecs delogo filter

2011-10-17 18:05:41 +02:00

vf_drawbox.c

doxygen: fix wrong comment syntax, //< vs. ///<

2011-08-26 18:34:28 +02:00

vf_drawtext.c

cosmetics: Drop unnecessary parentheses around return values.

2011-12-30 22:18:07 +01:00

vf_fade.c

cosmetics: Move static and inline attributes to more standard places.

2012-01-14 17:32:36 +01: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

Add some missing mathematics.h #includes for av_rescale().

2011-07-05 20:16:38 +02: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:33:13 +02:00

vf_lut.c

lavfi: add negate filter

2011-10-17 18:05:41 +02:00

vf_null.c

Replace FFmpeg with Libav in licence headers

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

vf_overlay.c

Do not include mathematics.h in avutil.h

2011-07-03 21:42:06 +01:00

vf_pad.c

vf_pad: fix "vsub" variable value computation

2011-09-28 08:03:30 +02: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

2011-09-28 08:08:30 +02:00

vf_select.c

lavfi: add select filter

2011-09-17 19:08:30 +02:00

vf_setpts.c

Do not include mathematics.h in avutil.h

2011-07-03 21:42:06 +01:00

vf_settb.c

Do not include mathematics.h in avutil.h

2011-07-03 21:42:06 +01:00

vf_showinfo.c

lavfi: add showinfo filter

2011-09-12 08:48:14 +02:00

vf_slicify.c

Replace FFmpeg with Libav in licence headers

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

vf_split.c

lavfi: add split filter from soc.

2011-09-12 08:48:16 +02:00

vf_transpose.c

Replace FFmpeg with Libav in licence headers

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

vf_unsharp.c

vf_unsharp: set default chroma size value to 5x5

2011-09-29 07:20:05 +02:00

vf_vflip.c

Replace FFmpeg with Libav in licence headers

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

vf_yadif.c

yadif: support 10bit YUV

2011-12-13 17:02:55 +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: release the buffer on uninit.

2012-01-12 08:59:00 +01:00

vsrc_buffer.h

vsrc_buffer: remove duplicated file description

2011-09-19 12:43:10 +02:00

vsrc_color.c

vsrc_color: use internal timebase

2011-09-28 08:03:11 +02:00

vsrc_movie.c

lavfi: add avfilter_copy_frame_props()

2011-12-25 16:18:57 +01:00

vsrc_nullsrc.c

Do not include mathematics.h in avutil.h

2011-07-03 21:42:06 +01:00

vsrc_testsrc.c

vsrc_testsrc: fix mailing list reference URL

2011-11-02 10:42:55 +01:00

yadif.h

Change yadif to not use out of picture lines.

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