[FFmpeg-cvslog] Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 25 19:24:40 2014 +0100| [41e7e46cac507e993af6d656c8d3672ba3f9e304] | committer: Michael Niedermayer

Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

* commit 'aa499568afc01d59215eef7e5b14b949a9671afc':
  avconv: More descriptive message about framedrop

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

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