[FFmpeg-cvslog] Merge commit 'd28fc7b29a728bd2f88c10121abbd0442c341746'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 21 19:03:59 2013 +0100| [c8a0a2e990ba80fefe96c3aa6e9ed46bc6001e3a] | committer: Michael Niedermayer

Merge commit 'd28fc7b29a728bd2f88c10121abbd0442c341746'

* commit 'd28fc7b29a728bd2f88c10121abbd0442c341746':
  avconv_filter: add new line after error message

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

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