Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 18:53:00 +0000 (20:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 18:53:00 +0000 (20:53 +0200)
commit9400603140db5f44f35942482a3435e4b67e7e79
tree6c78861678fbf746cc94214295cad1e1d387f8a2
parent76aec9e6b4a2aabe659013198620276822420ad9
parent9f17685dfb70a73823aca16ad246ee3b831d1de8
Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'

* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
  avcodec: Deprecate unused defines and options

Conflicts:
doc/APIchanges
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h