summaryrefslogtreecommitdiffstats
path: root/libavcodec/mpegvideo.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-18 19:41:48 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-18 19:41:48 +0200
commitbf301258b49ff6f700a096c5752864e789c6e6b3 (patch)
tree0728f30a569ad66df9aa37d2112077799f1f3eee /libavcodec/mpegvideo.h
parent25f4e9387d0efd6fe2ac51d78eb681c542a6f82d (diff)
downloadffmpeg-streaming-bf301258b49ff6f700a096c5752864e789c6e6b3.zip
ffmpeg-streaming-bf301258b49ff6f700a096c5752864e789c6e6b3.tar.gz
avcodec/snowenc: add FF_MPV_COMMON_OPTS
This fixes the ratecontrol code with snow adding FF_MPV_COMMON_OPTS is needed as the generic rate control options are currently in the (unrelated) MpegEncContext Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
-rw-r--r--libavcodec/mpegvideo.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 286954f..6946c60 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -694,7 +694,9 @@ typedef struct MpegEncContext {
#define FF_MPV_FLAG_NAQ 0x0010
#define FF_MPV_FLAG_MV0 0x0020
+#ifndef FF_MPV_OFFSET
#define FF_MPV_OFFSET(x) offsetof(MpegEncContext, x)
+#endif
#define FF_MPV_OPT_FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
#define FF_MPV_COMMON_OPTS \
{ "mpv_flags", "Flags common for all mpegvideo-based encoders.", FF_MPV_OFFSET(mpv_flags), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "mpv_flags" },\
OpenPOWER on IntegriCloud