[FFmpeg-cvslog] Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jan  7 00:38:50 2015 +0100| [0d0a905152f6792901551bf3be39a38b38a36656] | committer: Michael Niedermayer

Merge commit 'e581e88cbdb3323ca0026a54b39a9716a3686e9f'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0d0a905152f6792901551bf3be39a38b38a36656
---