[FFmpeg-cvslog] Merge commit 'f046c3b5ac36848cce824b008e0347c621523041'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul  3 21:40:41 2015 +0200| [3b03186d56794b902050a36516e44191ba07bb05] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b03186d56794b902050a36516e44191ba07bb05
---