[FFmpeg-cvslog] Merge branch 'master' into oldabi

[Michael Niedermayer]

ffmpeg | branch: oldabi | Michael Niedermayer <michaelni at gmx.at> | Tue Jun 21 21:55:46 2011 +0200| [1986380df2caaa663f63d0a3b9f0413a3d862757] | committer: Michael Niedermayer

Merge branch 'master' into oldabi

* master:
  ffplay: do not init SDL audio if -an is specified.
  Fix zero-length gnu_printf format string warning.
  A cmp instruction with two constants is invalid, thus "g" constraint is not correct but must be "rm" instead.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1986380df2caaa663f63d0a3b9f0413a3d862757
---