Develop#58

aashishg wants to merge 2 commits intomastercropsly/ffmpeg-android:masterfrom

developcropsly/ffmpeg-android:developCopy head branch name to clipboard