Merge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb'
authorClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 13:51:38 +0000 (14:51 +0100)
committerClément Bœsch <u@pkh.me>
Tue, 21 Mar 2017 13:54:07 +0000 (14:54 +0100)
commitbb7cc5b5d928cbc948881f4f9b8b055129fe0f0b
tree194a24bba3481dcc502ad589b1a64a912de95a25
parent5dfe343d96dcd2159cb9242304f1336cb0176d11
parent67d28f4a0fbb52d0734ca3682b85035e96d294fb
Merge commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb'

* commit '67d28f4a0fbb52d0734ca3682b85035e96d294fb':
  examples/output: switch to the new encoding API

This commit is a noop, our examples are different. Still, we need to
update them to the new API, so doc/libav-merge.txt is updated.

Merged-by: Clément Bœsch <u@pkh.me>
doc/libav-merge.txt