[FFmpeg-cvslog] Merge commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Mon Sep  7 16:08:42 2015 +0200| [1789e46d34c11da6067f7035f9221ecc49e79552] | committer: Hendrik Leppkes

Merge commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17'

* commit '5a1a9da8a7ae120f2543b8f2fa13dc8baac39f17':
  mpegvideo: Drop a stray error message

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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