Revert "Build fix."

This reverts commit 146d2e80992671329030f29252882198e7789109.
Revert "Experimental update."

This reverts commit 8b86fc18f5f437856aca446d8f46fcb9ee5e9e0d.
ffmpeg reverted to 2.2.3
bug fix in sample