Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:47:04 +0000 (12:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:47:04 +0000 (12:47 +0200)
commitda2038221bc68e28edaaeddecff8d48cce2c9e52
tree6a8ff920c6cef98e0468576246aeeb6edae2cb36
parentef4fcb30c4ec55aad8f3872534be06491f8db917
parent2bbad1f94cbc5eab0aa2d937bc79d085477d0242
Merge commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242'

* commit '2bbad1f94cbc5eab0aa2d937bc79d085477d0242':
  movenc: Properly free allocated data on failures in mov_write_header

Conflicts:
libavformat/movenc.c

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