[FFmpeg-cvslog] Merge commit '1aa24df74c052a73175c43e57d35b4835e537ec8'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  3 09:52:39 2015 +0200| [5fa5e73e81f191be0c4761bb4c517fdd39aff82e] | committer: Hendrik Leppkes

Merge commit '1aa24df74c052a73175c43e57d35b4835e537ec8'

* commit '1aa24df74c052a73175c43e57d35b4835e537ec8':
  lavu: Deprecate AVFrame.error[]

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

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