diff options
| author | Mina Nagy Zaki <mnzaki@gmail.com> | 2011-06-08 19:24:25 +0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-10-06 10:35:38 +0200 |
| commit | 0dfcbe5285f04964f5de5e15a4bfbf83fb9fd082 (patch) | |
| tree | 0dde4e68da7b37a0f42f5b71a7d81ddaa6d2d04b /libavcodec/rangecoder.h | |
| parent | 6d6373dc6441b26271d37ec372507e29c0123a88 (diff) | |
| download | ffmpeg-0dfcbe5285f04964f5de5e15a4bfbf83fb9fd082.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>
(cherry picked from commit e5f4e249422834f727bcd432b73af971277f1371)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit b6c5848a1f8fc2755ea70d325acaddae9fac45ab)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit a4e277312cacfb78ef7583ed0b4fe4ccf5a0bcb1)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec/rangecoder.h')
0 files changed, 0 insertions, 0 deletions