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>
pull/206/head
Derek Buitenhuis 9 years ago
commit 528af33b6f

Diff Content Not Available