Bitbucket cannot automatically merge this request.
The commits that make up this pull request have been removed.
Bitbucket cannot automatically merge this request due to conflicts.
Review the conflicts on the Overview tab. You can then either decline the request or merge it manually on your local system using the following commands:
git checkout master
git remote add daniel_fort/mlvfs https://bitbucket.org/daniel_fort/mlvfs.git
git fetch daniel_fort/mlvfs
git merge --no-ff -m 'Merged in daniel_fort/mlvfs/fpm_updates (pull request #13)' remotes/daniel_fort/mlvfs/fpm_updates
New issues found in mv1080crop and zoom video modes when using lossless compression.