[FFmpeg-cvslog] Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

[Carl Eugen Hoyos]

Michael Niedermayer <git <at> videolan.org> writes:

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

Not all users seem to like this:
http://thread.gmane.org/gmane.comp.video.ffmpeg.user/51229

Carl Eugen