-
Michael Niedermayer authored
* qatar/master: swscale: fix NULL checking in sws_alloc_context() mxfdec: fix NULL checking in mxf_get_sorted_table_segments() finalize changelog for version 9 Conflicts: Changelog libavformat/mxfdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
bb4fb771