diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-03 13:44:14 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-09-07 12:37:47 +0200 |
| commit | 2268db2cd052674fde55c7d48b7a5098ce89b4ba (patch) | |
| tree | b8bedf84f2777a5a46ab1c73668ff76da22ba54b /libswscale/output.c | |
| parent | 6b3ef7f080293956b2e5212b83135c6b051212e9 (diff) | |
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
The new fields can be accessed directly and are more intelligible.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libswscale/output.c')
| -rw-r--r-- | libswscale/output.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/output.c b/libswscale/output.c index 1670f4a2b9..1466f0a2fc 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -1279,7 +1279,7 @@ yuv2gbrp_full_X_c(SwsContext *c, const int16_t *lumFilter, int i; int hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpSrc; uint16_t **dest16 = (uint16_t**)dest; - int SH = 22 + 7 - desc->comp[0].depth_minus1; + int SH = 22 + 8 - desc->comp[0].depth; for (i = 0; i < dstW; i++) { int j; @@ -1366,7 +1366,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c; *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c; } else if (is9_OR_10BPS(dstFormat)) { - if (desc->comp[0].depth_minus1 == 8) { + if (desc->comp[0].depth == 9) { *yuv2planeX = isBE(dstFormat) ? yuv2planeX_9BE_c : yuv2planeX_9LE_c; *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_9BE_c : yuv2plane1_9LE_c; } else { |