diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-08-05 13:23:52 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-08-05 16:13:35 +0200 |
| commit | bc54c2ae3ca6abd225dc331eafc12108513158de (patch) | |
| tree | 2662c88b85a482e41a16ee906d33f982b66d3fc2 /libavcodec/libx264.c | |
| parent | c84ea750cf765c9d8845fca5546eb0ae25b9c855 (diff) | |
| download | ffmpeg-bc54c2ae3ca6abd225dc331eafc12108513158de.tar.gz | |
libx264: add shortcut for the bluray compatibility option
As for intra-refresh it is just a commodity.
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 665b31e36c..5d0c7a1693 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -61,6 +61,7 @@ typedef struct X264Context { int weightb; int ssim; int intra_refresh; + int bluray_compat; int b_bias; int b_pyramid; int mixed_refs; @@ -358,6 +359,10 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.analyse.b_ssim = x4->ssim; if (x4->intra_refresh >= 0) x4->params.b_intra_refresh = x4->intra_refresh; + if (x4->bluray_compat >= 0) { + x4->params.b_bluray_compat = x4->bluray_compat; + x4->params.b_vfr_input = 0; + } if (x4->b_bias != INT_MIN) x4->params.i_bframe_bias = x4->b_bias; if (x4->b_pyramid >= 0) @@ -524,6 +529,7 @@ static const AVOption options[] = { { "smart", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_WEIGHTP_SMART}, INT_MIN, INT_MAX, VE, "weightp" }, { "ssim", "Calculate and print SSIM stats.", OFFSET(ssim), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, { "intra-refresh", "Use Periodic Intra Refresh instead of IDR frames.",OFFSET(intra_refresh),AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, + { "bluray-compat", "Bluray compatibility workarounds.", OFFSET(bluray_compat) ,AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, { "b-bias", "Influences how often B-frames are used", OFFSET(b_bias), AV_OPT_TYPE_INT, { .i64 = INT_MIN}, INT_MIN, INT_MAX, VE }, { "b-pyramid", "Keep some B-frames as references.", OFFSET(b_pyramid), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, VE, "b_pyramid" }, { "none", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = X264_B_PYRAMID_NONE}, INT_MIN, INT_MAX, VE, "b_pyramid" }, |