diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-08 08:07:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-08 08:07:05 +0100 |
| commit | bc17a6f5c012522186592fcbc3acaa7701c4b208 (patch) | |
| tree | 39f9098fca3f6fff152298bc819078428694cf22 /libavcodec/libvpxenc.c | |
| parent | 78e08fd340e03b49f75e1ac31c20cc21434794bd (diff) | |
| parent | 12776d5d2a46363c52603ae2be888a3094fce1c6 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libvpxenc: Allow enabling constrained quality (CQ) mode
Conflicts:
configure
libavcodec/libvpxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libvpxenc.c')
| -rw-r--r-- | libavcodec/libvpxenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index aecff79b87..320f5f81bd 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -603,8 +603,8 @@ static const AVOption options[] = { {"arnr_strength", "altref noise reduction filter strength", offsetof(VP8Context, arnr_strength), AV_OPT_TYPE_INT, {.i64 = 3}, 0, 6, VE}, {"arnr_type", "altref noise reduction filter type", offsetof(VP8Context, arnr_type), AV_OPT_TYPE_INT, {.i64 = 3}, 1, 3, VE}, {"rc_lookahead", "Number of frames to look ahead for alternate reference frame selection", offsetof(VP8Context, lag_in_frames), AV_OPT_TYPE_INT, {.i64 = 25}, 0, 25, VE}, -{"crf", "Select the quality for constant quality mode", offsetof(VP8Context, crf), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 63, VE}, -{NULL} + { "crf", "Select the quality for constant quality mode", offsetof(VP8Context, crf), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 63, VE }, + { NULL } }; static const AVClass class = { |