Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:38:50 +0000 (00:38 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Jan 2015 23:39:44 +0000 (00:39 +0100)
commit0d0a905152f6792901551bf3be39a38b38a36656
treea4bb3d18da665b468cd07e882c6e530c0abae6a8
parent4009ee3eccac686ee2f01837cc8877012c47314c
parente581e88cbdb3323ca0026a54b39a9716a3686e9f
Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'

* commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f':
  movenc: Readd an accidentally removed condition

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