diff options
| author | Mark Thompson <sw@jkqxz.net> | 2020-07-28 23:50:20 +0100 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2020-08-01 17:18:30 +0100 |
| commit | e80fe329435d08f13a4b506c1af06359a31267f9 (patch) | |
| tree | 3a447c142cac1e88b5c586f8a5fb21510bc2c76e | |
| parent | 11a2d05b3fa977ea9437725531a4875b735c977e (diff) | |
| download | ffmpeg-e80fe329435d08f13a4b506c1af06359a31267f9.tar.gz | |
vaapi_encode_h265: Remove confusing and redundant tile options
The tile_rows/cols options currently do a confusingly different thing to
the options of the same name on other encoders like libvpx and libaom.
There is no backward-compatibility reason to implement the log2 behaviour
as there was for libaom, so just get rid of them entirely.
| -rw-r--r-- | doc/encoders.texi | 8 | ||||
| -rw-r--r-- | libavcodec/vaapi_encode_h265.c | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi index 2f5457fb26..78b3be9605 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3268,14 +3268,6 @@ Set the number of tiles to encode the input video with, as rows x columns. Larger numbers allow greater parallelism in both encoding and decoding, but may decrease coding efficiency. -@item tile_rows -Selects how many rows of tiles to encode with. For example, 4 tile rows would -be requested by setting the tile_rows option to 4. - -@item tile_cols -Selects how many columns of tiles to encode with. For example, 5 tile columns -would be requested by setting the tile_cols option to 5. - @end table @item mjpeg_vaapi diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index f6008778df..511218f659 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1291,10 +1291,6 @@ static const AVOption vaapi_encode_h265_options[] = { { "tiles", "Tile rows x cols", OFFSET(trows), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, FLAGS }, - { "tile_rows", "Number of rows for tile encoding", - OFFSET(trows), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, - { "tile_cols", "Number of cols for tile encoding", - OFFSET(tcols), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, { NULL }, }; |