diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 13:48:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 13:49:53 +0100 |
| commit | 42431a557e2df0289e725b518b0d7a3e1a4e39b3 (patch) | |
| tree | abdfd5a10c54e8130e836a17a10a21ac82d205a3 /libswscale | |
| parent | e88f392733fe6269fdb3fea2627b037ff654c4ce (diff) | |
| parent | d6d5ef5534d582f9dbaf18ac2605cf5bb72cd821 (diff) | |
| download | ffmpeg-42431a557e2df0289e725b518b0d7a3e1a4e39b3.tar.gz | |
Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'
* commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821':
sws: GBRP9, GBRP10, and GBRP16 output support
Conflicts:
libswscale/output.c
libswscale/utils.c
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/output.c | 2 | ||||
| -rw-r--r-- | libswscale/utils.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libswscale/output.c b/libswscale/output.c index d1a3bee59e..d9745fbab8 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -1571,6 +1571,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, case AV_PIX_FMT_GBRP12LE: case AV_PIX_FMT_GBRP14BE: case AV_PIX_FMT_GBRP14LE: + case AV_PIX_FMT_GBRP16BE: + case AV_PIX_FMT_GBRP16LE: *yuv2anyX = yuv2gbrp_full_X_c; break; } diff --git a/libswscale/utils.c b/libswscale/utils.c index 9e73adce38..f4d4ef66ef 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -991,7 +991,6 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, getSubSampleFactors(&c->chrSrcHSubSample, &c->chrSrcVSubSample, srcFormat); getSubSampleFactors(&c->chrDstHSubSample, &c->chrDstVSubSample, dstFormat); - if (isAnyRGB(dstFormat) && !(flags&SWS_FULL_CHR_H_INT)) { if (dstW&1) { av_log(c, AV_LOG_DEBUG, "Forcing full internal H chroma due to odd output size\n"); |