* qatar/master:
  avcodec/options: Drop deprecation warning suppression macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>