Merge commit 'f046c3b5ac36848cce824b008e0347c621523041'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 19:40:41 +0000 (21:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Jul 2015 19:40:47 +0000 (21:40 +0200)
commit3b03186d56794b902050a36516e44191ba07bb05
treef2ed3a006f0dba894ece074c7440551c9ba29c91
parentd563e13a7c7daa03c89636f85305e1839bcb27be
parentf046c3b5ac36848cce824b008e0347c621523041
Merge commit 'f046c3b5ac36848cce824b008e0347c621523041'

* commit 'f046c3b5ac36848cce824b008e0347c621523041':
  lavc: Move deprecation warning disabling to files including the table
  lavc: Disable deprectation warnings coming from options table

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/options.c
libavformat/options.c