Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jan 2013 12:37:30 +0000 (13:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 5 Jan 2013 12:37:30 +0000 (13:37 +0100)
commitbb4fb7715cf7a19e9833a3a8a598342552499a24
treec6ba5923ab1a967f8a4bfa017f9f730ec7894c18
parent2163c8828d21d9c774ba69c8264c865921a47f2b
parentf73f76fd202b310e8e1d0215b2e0cf038cd18c4a
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>
libswscale/utils.c