Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:13:28 +0000 (15:13 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 18 Apr 2016 14:13:28 +0000 (15:13 +0100)
commit528af33b6f4595f6d77da47eca7e9a5dcda8c84d
tree4d27959ae028c178e8db4cf2c0478d0f4bb2dd45
parent1be5509fbbc6d1675074ca58a546eba26c63ec74
parent8bc4accc37ab047d2fd85d672c577b39dfc918e1
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@gmail.com>