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)
* 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>
1  2 
libswscale/utils.c

Simple merge