FFmpeg resync to FFmpeg release/1.2 at SHA1 33d699a4e73d5281b2cfcd0fa355c0d80241dd23