diff options
| author | Mark Thompson <sw@jkqxz.net> | 2020-07-28 23:50:21 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2020-08-01 17:39:13 +0100 |
| commit | bc58d1f58eeb7f80049b18395256f2a8cb039f64 (patch) | |
| tree | 718991f54aa0a477cbcae513ed71a201dff022ef /libavcodec/vaapi_encode_h265.c | |
| parent | e80fe329435d08f13a4b506c1af06359a31267f9 (diff) | |
| download | ffmpeg-bc58d1f58eeb7f80049b18395256f2a8cb039f64.tar.gz | |
vaapi_encode_h265: Fix ordering of tile dimensions
Dimensions are normally specified as width x height, and this will match
the same option to libaom-av1.
Remove the indirection through the private context at the same time.
Diffstat (limited to 'libavcodec/vaapi_encode_h265.c')
| -rw-r--r-- | libavcodec/vaapi_encode_h265.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 511218f659..04bd2bef1d 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -63,9 +63,6 @@ typedef struct VAAPIEncodeH265Context { int level; int sei; - int trows; - int tcols; - // Derived settings. int fixed_qp_idr; int fixed_qp_p; @@ -1208,11 +1205,6 @@ static av_cold int vaapi_encode_h265_init(AVCodecContext *avctx) if (priv->qp > 0) ctx->explicit_qp = priv->qp; - if (priv->trows && priv->tcols) { - ctx->tile_rows = priv->trows; - ctx->tile_cols = priv->tcols; - } - return ff_vaapi_encode_init(avctx); } @@ -1289,8 +1281,9 @@ static const AVOption vaapi_encode_h265_options[] = { { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, INT_MIN, INT_MAX, FLAGS, "sei" }, - { "tiles", "Tile rows x cols", - OFFSET(trows), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, FLAGS }, + { "tiles", "Tile columns x rows", + OFFSET(common.tile_cols), AV_OPT_TYPE_IMAGE_SIZE, + { .str = NULL }, 0, 0, FLAGS }, { NULL }, }; |