1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00

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>
This commit is contained in:
Michael Niedermayer 2013-11-01 18:36:03 +01:00
commit 66df6f5407

View File

@ -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.