Merge commit '0300962b76644f145b773439989a5cdf1667e162'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:03:04 +0000 (19:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:03:19 +0000 (19:03 +0100)
commit7592d30bcb95427c3173b7dd2b4d68f7083c5a9c
tree6a05812d0734898b3eacc65c721b7bfd87d7bc2f
parent9bcf647867cf0c8ddad0b728264bcf77c36299ee
parent0300962b76644f145b773439989a5cdf1667e162
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>
libavcodec/avcodec.h
libavcodec/options_table.h
libavcodec/version.h