[FFmpeg-cvslog] Merge commit '9469370fb32679352e66826daf77bdd2e6f067b5'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Aug  7 09:54:12 2015 +0200| [8015150f43875531f05e31ac5021ea676fb20e40] | committer: Hendrik Leppkes

Merge commit '9469370fb32679352e66826daf77bdd2e6f067b5'

* commit '9469370fb32679352e66826daf77bdd2e6f067b5':
  h264: Use AVERROR return codes instead of -1

Only partially merged, as the first hunk is not correct and would result
in endless log spam.

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

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