Merge commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Nov 2014 23:32:40 +0000 (00:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 7 Nov 2014 23:32:52 +0000 (00:32 +0100)
commit872c0bcd3c04802f97cf08235aa1544f33e46821
treeabcb6d79371d548cb9b92a710d35778bc5909ad4
parent2893d1b36d17f4a244ce84311b0ace541c7e1593
parente7d20f12c5eff5570cd897f3ce3a88456024036b
Merge commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b'

* commit 'e7d20f12c5eff5570cd897f3ce3a88456024036b':
  movenc: Remove a now redundant check

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