summaryrefslogtreecommitdiffstats
path: root/libavcodec/vp3_parser.c
diff options
context:
space:
mode:
authorMina Nagy Zaki <[email protected]>2011-06-08 19:24:25 +0300
committerReinhard Tartler <[email protected]>2013-02-10 18:01:15 +0100
commit4475a7d88b89a6ff064f8917ee71657291d1a37a (patch)
tree3c1c9c84101ab2603113122feecf8c946cb0c407 /libavcodec/vp3_parser.c
parent0f6d4da8def2c697b2512a12285a227ec7d5bb9b (diff)
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 <[email protected]> (cherry picked from commit 11b6a82412bcd372adf694a26d83b07d337e1325) Conflicts: libavfilter/formats.c Signed-off-by: Reinhard Tartler <[email protected]>
Diffstat (limited to 'libavcodec/vp3_parser.c')
0 files changed, 0 insertions, 0 deletions