diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 14:06:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-28 14:11:31 +0100 |
| commit | bb2f4ae434223e99f131100f4bc71762b79eb6c5 (patch) | |
| tree | c852670be02a3ec5972b389a238eabcf59f04095 /libswscale/utils.c | |
| parent | 51e9d2dbc8f8e7aed216222a496cc7e588afa217 (diff) | |
| parent | 05b0998f511ffa699407465d48c7d5805f746ad2 (diff) | |
| download | ffmpeg-bb2f4ae434223e99f131100f4bc71762b79eb6c5.tar.gz | |
Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'
* commit '05b0998f511ffa699407465d48c7d5805f746ad2':
dsputil: Fix error by not using redzone and register name
swscale: GBRP output support
Conflicts:
libswscale/output.c
libswscale/swscale.c
libswscale/swscale_internal.h
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/utils.c')
| -rw-r--r-- | libswscale/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index c10bd7ce73..9e73adce38 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -1022,8 +1022,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, if (isPlanarRGB(dstFormat)) { if (!(flags & SWS_FULL_CHR_H_INT)) { av_log(c, AV_LOG_DEBUG, - "%s output is not supported with half chroma resolution, switching to full\n", - av_get_pix_fmt_name(dstFormat)); + "%s output is not supported with half chroma resolution, switching to full\n", + av_get_pix_fmt_name(dstFormat)); flags |= SWS_FULL_CHR_H_INT; c->flags = flags; } |