[FFmpeg-cvslog] Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Apr 18 15:13:28 2016 +0100| [528af33b6f4595f6d77da47eca7e9a5dcda8c84d] | committer: Derek Buitenhuis

Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'

This commit is a no-op. wm4 is working to get these into ffmpeg
proper, with ffmpeg versions of the patches.

* commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1':
  lavf: use new decode API
  avconv: use new encode API
  avconv: use new decode API
  lavc: introduce a new decoding/encoding API with decoupled input/output

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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