Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:50:08 +0000 (21:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:50:08 +0000 (21:50 +0100)
commit80c5dc56104d96eae2d3170720bf5aa4f90467e4
tree1e3a3294aea277f1b8d22ee607dc3cd0094ea9b9
parent575ed4fe37fdb1558fbbc261661b6239d47bcd8c
parenta8765852158ecb2ae34895fa35ff51dc95c186f9
Merge commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9'

* commit 'a8765852158ecb2ae34895fa35ff51dc95c186f9':
  movenc: Check memory allocations

Conflicts:
libavformat/movenc.c

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