diff options
| author | Mina Nagy Zaki <mnzaki@gmail.com> | 2011-06-08 19:24:25 +0300 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-01-04 07:43:21 +0100 |
| commit | 10c244cc89e80e1e924d442ccf40935bd7162178 (patch) | |
| tree | b9f2fdb7ecc4d9d6440c9599d403ddd82a3607c1 /libavformat/mvi.c | |
| parent | 99008ba3667a28af5efe0934aa20aa37df8dbd86 (diff) | |
| download | ffmpeg-10c244cc89e80e1e924d442ccf40935bd7162178.tar.gz | |
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>
Diffstat (limited to 'libavformat/mvi.c')
0 files changed, 0 insertions, 0 deletions