Merge commit '554fd5cd630073b8273aa044a6bdfd6f608209e9' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:50:29 +0000 (21:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:50:29 +0000 (21:50 +0100)
* commit '554fd5cd630073b8273aa044a6bdfd6f608209e9':
  ffmpeg: Clarify wording of ffmpeg --> avconv deprecation message

Conflicts:
ffmpeg.c

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

Trivial merge