[FFmpeg-cvslog] Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 18:47:47 2013 +0100| [2a2cc0af6dcd546d7f624a0b5b004c46a512c183] | committer: Michael Niedermayer

Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'

* commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8':
  lavc: deprecate FF_DEBUG_VIS_*

leave the AVOptions as they work fine

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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