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)
* commit '0300962b76644f145b773439989a5cdf1667e162':
  lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.

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

Simple merge
Simple merge
Simple merge