diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 15:43:03 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 16:35:28 +0200 |
| commit | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (patch) | |
| tree | 866bd99edecd778aee4cd8eb5f34977d0c82a27d /libswscale/output.c | |
| parent | f53569a93f853057d4852601b547a1d9c57613b6 (diff) | |
| parent | 2268db2cd052674fde55c7d48b7a5098ce89b4ba (diff) | |
| download | ffmpeg-151aa2ebff514a9d150a2d3a7b92be1dcc46df36.tar.gz | |
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@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 31e10237d8..16cfd75c5a 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -1845,7 +1845,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; int A = 0; // init to silence warning for (i = 0; i < dstW; i++) { @@ -2073,7 +2073,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 if (desc->comp[0].depth_minus1 == 9) { |