diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-07-29 02:09:12 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-07-29 02:09:12 +0000 |
| commit | 7d1c3fc1d683d53982a1dec14f0f9749a07ae48d (patch) | |
| tree | 23a9984eef372f9710641e2cb6f302ea9af1727f /libavcodec/avcodec.h | |
| parent | 80adda8efd35c920c7ba0c43d530102a2fd22bc3 (diff) | |
| download | ffmpeg-7d1c3fc1d683d53982a1dec14f0f9749a07ae48d.tar.gz | |
rate distortion mb decision support
fix decoding of old %16!=0 divx
fix assertion failure in motion_est.c
Originally committed as revision 2094 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e61dd43a46..889c3147ae 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -15,8 +15,8 @@ extern "C" { #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4672 -#define LIBAVCODEC_BUILD_STR "4672" +#define LIBAVCODEC_BUILD 4673 +#define LIBAVCODEC_BUILD_STR "4673" #define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR @@ -169,7 +169,6 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, Note: note not everything is supported yet */ -#define CODEC_FLAG_HQ 0x0001 ///< brute force MB-type decission mode (slow) #define CODEC_FLAG_QSCALE 0x0002 ///< use fixed qscale #define CODEC_FLAG_4MV 0x0004 ///< 4 MV per MB allowed #define CODEC_FLAG_QPEL 0x0010 ///< use qpel MC @@ -1173,7 +1172,17 @@ typedef struct AVCodecContext { * - decoding: set by decoder */ int xvmc_acceleration; - + + /** + * macroblock decision mode + * - encoding: set by user. + * - decoding: unused + */ + int mb_decision; +#define FF_MB_DECISION_SIMPLE 0 ///< uses mb_cmp +#define FF_MB_DECISION_BITS 1 ///< chooses the one which needs the fewest bits +#define FF_MB_DECISION_RD 2 ///< rate distoration + } AVCodecContext; |