Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Mar 2014 18:24:40 +0000 (19:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 25 Mar 2014 18:25:10 +0000 (19:25 +0100)
commit41e7e46cac507e993af6d656c8d3672ba3f9e304
tree896287ec9cec98a63cddeda702e4bea8c1649b83
parent10e931d51477d10cb3507cc5a67fe356bb6c892c
parentaa499568afc01d59215eef7e5b14b949a9671afc
Merge commit 'aa499568afc01d59215eef7e5b14b949a9671afc'

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

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