diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:03:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 17:03:59 +0200 |
| commit | e77b9853ea66ef6c34b04d121c5b3d1afaa33971 (patch) | |
| tree | d29ef557ca9f706269711b2a31663d956f237996 /libavcodec/avcodec.h | |
| parent | e40ae8cc00ae7e485a64a5b3b40b73dbfd32b631 (diff) | |
| parent | a2941c8cb216bdc144953cace64973f5600ffa2d (diff) | |
| download | ffmpeg-e77b9853ea66ef6c34b04d121c5b3d1afaa33971.tar.gz | |
Merge commit 'a2941c8cb216bdc144953cace64973f5600ffa2d'
* commit 'a2941c8cb216bdc144953cace64973f5600ffa2d':
lavc: move CODEC_FLAG_MV0 to mpegvideo
Conflicts:
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 883f6cdf1c..35ecc6df9a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -751,7 +751,13 @@ typedef struct RcOverride{ */ #define CODEC_FLAG_GMC 0x0020 ///< Use GMC. #endif -#define CODEC_FLAG_MV0 0x0040 ///< Always try a MB with MV=<0,0>. +#if FF_API_MV0 +/** + * @deprecated use the flag "mv0" in the "mpv_flags" private option of the + * mpegvideo encoders + */ +#define CODEC_FLAG_MV0 0x0040 +#endif #if FF_API_INPUT_PRESERVED /** * @deprecated passing reference-counted frames to the encoders replaces this |