aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/avcodec.h
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-08-27 10:16:14 +0200
committerAnton Khirnov <anton@khirnov.net>2011-08-31 13:27:36 +0200
commit9bb2d1a3f0ea3595fafad32d6ee1261506f57bb4 (patch)
treef66593bae044dad107a63ad389efae0ee0fa803d /libavcodec/avcodec.h
parent0e5d37309f54f4377ec1f1a7ca41ea06d4ade923 (diff)
downloadffmpeg-9bb2d1a3f0ea3595fafad32d6ee1261506f57bb4.tar.gz
h263p encoder: add 'umv' private option.
Deprecate CODEC_FLAG_H263P_UMV
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r--libavcodec/avcodec.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index ce862b66c0..bc01f4559c 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -599,7 +599,9 @@ typedef struct RcOverride{
#define CODEC_FLAG_BITEXACT 0x00800000 ///< Use only bitexact stuff (except (I)DCT).
/* Fx : Flag for h263+ extra options */
#define CODEC_FLAG_AC_PRED 0x01000000 ///< H.263 advanced intra coding / MPEG-4 AC prediction
+#if FF_API_MPEGVIDEO_GLOBAL_OPTS
#define CODEC_FLAG_H263P_UMV 0x02000000 ///< unlimited motion vector
+#endif
#define CODEC_FLAG_CBP_RD 0x04000000 ///< Use rate distortion optimization for cbp.
#define CODEC_FLAG_QP_RD 0x08000000 ///< Use rate distortion optimization for qp selectioon.
#define CODEC_FLAG_H263P_AIV 0x00000008 ///< H.263 alternative inter VLC