Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:34:53 +0000 (14:34 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:34:53 +0000 (14:34 +0200)
commit69c38d64d745c678f2f596f5932a5121b7aafc07
tree35a4f898c2b5b68474ed3c0a90a3d7d8cdb6af0f
parent6988cf2969d777ebac84d241123883357375dc6c
parent04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f
Merge commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f'

* commit '04fc8e24a091ed1d77d7a3c0cbcfe60baec19a9f':
  lavc: deprecate avcodec_get_context_defaults3()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/avcodec.h
libavcodec/options.c
libavcodec/version.h