Merge commit '8bc4accc37ab047d2fd85d672c577b39dfc918e1'

Browse Source

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>

...

This commit is contained in:

Derek Buitenhuis 2016-04-18 15:13:28 +01:00

parent 1be5509fbb 8bc4accc37

commit 528af33b6f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available