Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:48:16 +0000 (16:48 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 14:48:31 +0000 (16:48 +0200)
commit83db013a063b67e86c3fc0d77d72a0ac76302974
treebb4c58f205ecb717a698fb3329b25de742964c00
parentf5b2718c0ae53459fbd506419884068687278583
parent0ba4ea312b2a6bebbdd7ff228d46385159c63c9f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avcodec/options: Drop deprecation warning suppression macros

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