[FFmpeg-cvslog] Merge commit '554fd5cd630073b8273aa044a6bdfd6f608209e9' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 11 21:50:29 2015 +0100| [8e37603ac9612448b9dbe64a9988e489d961caee] | committer: Michael Niedermayer

Merge commit '554fd5cd630073b8273aa044a6bdfd6f608209e9' into release/0.10

* commit '554fd5cd630073b8273aa044a6bdfd6f608209e9':
  ffmpeg: Clarify wording of ffmpeg --> avconv deprecation message

Conflicts:
	ffmpeg.c

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

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