Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'
authorClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:51:36 +0000 (19:51 +0200)
committerClément Bœsch <u@pkh.me>
Wed, 22 Jun 2016 17:51:36 +0000 (19:51 +0200)
commit541e1c2c3b7cf11c6c504dc03cd9b0559dfff3df
treec322202e0a64f71aee2d039e6a6c28799f4d790b
parent93f5a27313af2872713b39616c1eb9eb1c3b6415
parent31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3
Merge commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3'

* commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
  lavc: mark the old audio/video encoding API as deprecated

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/avcodec.h