diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 14:07:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-10 14:07:27 +0100 |
| commit | f2b89f21cc3dfcfda911e621c3ea62f3175eacbe (patch) | |
| tree | 984cf3d1534a4ef08d645f8b467ac6cb6ce44a1b /libswscale | |
| parent | 0b1896543446491ed3d28aea82e3f990ec514c65 (diff) | |
| parent | 7b41c24c5fa221b55a9302efaf1a9eeb38b12551 (diff) | |
| download | ffmpeg-streaming-f2b89f21cc3dfcfda911e621c3ea62f3175eacbe.zip ffmpeg-streaming-f2b89f21cc3dfcfda911e621c3ea62f3175eacbe.tar.gz | |
Merge commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551'
* commit '7b41c24c5fa221b55a9302efaf1a9eeb38b12551':
sws: dont enable chrSrcHSubSample for planar RGB
Conflicts:
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/utils.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index f4d4ef6..932cf94 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1068,6 +1068,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, srcFormat != AV_PIX_FMT_GBRP10BE && srcFormat != AV_PIX_FMT_GBRP10LE && srcFormat != AV_PIX_FMT_GBRP12BE && srcFormat != AV_PIX_FMT_GBRP12LE && srcFormat != AV_PIX_FMT_GBRP14BE && srcFormat != AV_PIX_FMT_GBRP14LE && + srcFormat != AV_PIX_FMT_GBRP16BE && srcFormat != AV_PIX_FMT_GBRP16LE && ((dstW >> c->chrDstHSubSample) <= (srcW >> 1) || (flags & SWS_FAST_BILINEAR))) c->chrSrcHSubSample = 1; |
