Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:47:47 +0000 (18:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:51:34 +0000 (18:51 +0100)
commit2a2cc0af6dcd546d7f624a0b5b004c46a512c183
tree1c87944d3e0c9d397bb0e0bea41c9522ff8377b7
parentf49e6359b694023db99c5fa2805cdb6a5a11709e
parentf8b2bcd2adab65658ffd45f9f13b032af6600bf8
Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'

* commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8':
  lavc: deprecate FF_DEBUG_VIS_*

leave the AVOptions as they work fine

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