Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'

* commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8': lavc: deprecate FF_DEBUG_VIS_* leave the AVOptions as they work fine Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 2a2cc0af6d
parent f49e6359b6 f8b2bcd2ad
commit 2a2cc0af6d
1 changed files with 2 additions and 0 deletions
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@ -2461,8 +2461,10 @@ typedef struct AVCodecContext {
 #define FF_DEBUG_ER          0x00000400
 #define FF_DEBUG_MMCO        0x00000800
 #define FF_DEBUG_BUGS        0x00001000
+#if FF_API_DEBUG_MV
 #define FF_DEBUG_VIS_QP      0x00002000
 #define FF_DEBUG_VIS_MB_TYPE 0x00004000
+#endif
 #define FF_DEBUG_BUFFERS     0x00008000
 #define FF_DEBUG_THREADS     0x00010000