[FFmpeg-cvslog] Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 28 12:03:41 2013 +0200| [5fd254c4f6db58b74a02a38f0d724e5fdc149d88] | committer: Michael Niedermayer

Merge commit '26a44143efb513a602542fb59aee87b1fc62af51'

* commit '26a44143efb513a602542fb59aee87b1fc62af51':
  avplay: remove a warning

Conflicts:
	ffplay.c

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

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