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)
* commit '31f6a4b4b83aca1d73f3cfc99ce2b39331970bf3':
  lavc: mark the old audio/video encoding API as deprecated

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

Simple merge