diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:36:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 18:36:46 +0100 |
| commit | 66df6f5407543cf791302bf3bc6958758bdae0eb (patch) | |
| tree | 02522c460273505d552e8eaca9aaf3e98dd150d5 | |
| parent | c97d397cbbf9f7fcbfeba1caaf8ecf7a1e35ab3d (diff) | |
| parent | a1504eee41b39f62dbfe0a0ca6b96c2716bf7577 (diff) | |
| download | ffmpeg-66df6f5407543cf791302bf3bc6958758bdae0eb.tar.gz | |
Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'
* commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577':
lavc: deprecate AVCodecContext.debug_mv
Conflicts:
libavcodec/options_table.h
Not merged, debug_mv works fine
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 a3f98ba01c..5dafd39227 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2466,6 +2466,7 @@ typedef struct AVCodecContext { #define FF_DEBUG_BUFFERS 0x00008000 #define FF_DEBUG_THREADS 0x00010000 +#if FF_API_DEBUG_MV /** * debug * - encoding: Set by user. @@ -2475,6 +2476,7 @@ typedef struct AVCodecContext { #define FF_DEBUG_VIS_MV_P_FOR 0x00000001 //visualize forward predicted MVs of P frames #define FF_DEBUG_VIS_MV_B_FOR 0x00000002 //visualize forward predicted MVs of B frames #define FF_DEBUG_VIS_MV_B_BACK 0x00000004 //visualize backward predicted MVs of B frames +#endif /** * Error recognition; may misdetect some more or less valid parts as errors. |