CC:libav-stable@libav.org (cherry picked from commit 2cd40680) Conflicts: cmdutils.c libavcodec/fraps.c