Merge commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 21:16:38 +0000 (22:16 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 21:20:52 +0000 (22:20 +0100)
* commit '1a4e4ad0e0c5486dcab05e54b587672a498dd7cf':
  mxf: Use av_malloc_array

Conflicts:
libavformat/mxfdec.c

See: 8ce41721a4a29711211f8dad0c86502caf86f4d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mxfdec.c

Simple merge