Merge commit '0300962b76644f145b773439989a5cdf1667e162'

* commit '0300962b76644f145b773439989a5cdf1667e162':
  lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/avcodec.h
Simple merge

diff --cc libavcodec/options_table.h
Simple merge

diff --cc libavcodec/version.h
Simple merge