Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:34:02 +0000 (14:34 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 26 Jun 2016 12:34:02 +0000 (14:34 +0200)
commit6988cf2969d777ebac84d241123883357375dc6c
tree8d1071655aa00c31b5491bd3065cdf9a17ad7204
parent97bdb94341ae60630f019f8fa057be9bb35c08c8
parent5f30ac27795f9f98043e8582ccaad8813104adc4
Merge commit '5f30ac27795f9f98043e8582ccaad8813104adc4'

* commit '5f30ac27795f9f98043e8582ccaad8813104adc4':
  lavc: deprecate avcodec_copy_context()

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