Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:33:39 +0000 (12:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Aug 2013 10:33:39 +0000 (12:33 +0200)
commitef4fcb30c4ec55aad8f3872534be06491f8db917
tree6494f351378372eada2bc111d8085166f36f187c
parent0bd15938ec5e0d5d77e217e7e3ce73c7c188ee5c
parent3559fb97c459c88b4f1d0eef80d55933d3b7fabe
Merge commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe'

* commit '3559fb97c459c88b4f1d0eef80d55933d3b7fabe':
  movenc: Check that tracks->enc exists before trying to free extradata

Conflicts:
libavformat/movenc.c

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