Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Aug 2013 07:57:07 +0000 (09:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 5 Aug 2013 07:57:28 +0000 (09:57 +0200)
commitdd98d9d1ff88b5dcd413e8d5359aaaf478de32e5
treec65fb88e1c4a0488f95577500cba268959251023
parentd6c36fba0be8aaa7ba3f15f8a2a7b872817200f3
parent7684a36113fa12c88ba80b5498f05849a6b58632
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxfenc: switch to av_reallocp_array() and check allocation errors

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mxfenc.c