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)
* 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>
1  2 
libavcodec/options.c
libavformat/options.c

Simple merge
Simple merge