Merge commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:36:53 +0000 (02:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 30 Oct 2014 01:37:03 +0000 (02:37 +0100)
commitad600e10da6beaa057ae16fdb12c94414dd6c20e
treece07e936bdfd89f5c3c74c8c421645b0884ad42e
parent39cce77faf156644681b9816b66c36b85a33c575
parent1e0b81abe86dc09dd34d60d57f92de5f12d65818
Merge commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818'

* commit '1e0b81abe86dc09dd34d60d57f92de5f12d65818':
  movenc: Use a local variable consistently

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