diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:47:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:51:34 +0100 |
| commit | 2a2cc0af6dcd546d7f624a0b5b004c46a512c183 (patch) | |
| tree | 1c87944d3e0c9d397bb0e0bea41c9522ff8377b7 /libavcodec | |
| parent | f49e6359b694023db99c5fa2805cdb6a5a11709e (diff) | |
| parent | f8b2bcd2adab65658ffd45f9f13b032af6600bf8 (diff) | |
| download | ffmpeg-2a2cc0af6dcd546d7f624a0b5b004c46a512c183.tar.gz | |
Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8'
* commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8':
lavc: deprecate FF_DEBUG_VIS_*
leave the AVOptions as they work fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7fa0680538..de9f1a635f 100644 --- 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 |