aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-01-05 13:37:30 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-01-05 13:37:30 +0100
commitbb4fb7715cf7a19e9833a3a8a598342552499a24 (patch)
treec6ba5923ab1a967f8a4bfa017f9f730ec7894c18 /LICENSE
parent2163c8828d21d9c774ba69c8264c865921a47f2b (diff)
parentf73f76fd202b310e8e1d0215b2e0cf038cd18c4a (diff)
downloadffmpeg-bb4fb7715cf7a19e9833a3a8a598342552499a24.tar.gz
Merge remote-tracking branch 'qatar/master'
* 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>
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions