[FFmpeg-cvslog] sws: handle jpeg pixel formats in sws_init_context()
Michael Niedermayer
git at videolan.org
Thu Nov 17 22:03:12 CET 2011
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 17 21:51:25 2011 +0100| [5bccb2d0965a66c132798c748b64a5025a5636a9] | committer: Michael Niedermayer
sws: handle jpeg pixel formats in sws_init_context()
Fixes Ticket576
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5bccb2d0965a66c132798c748b64a5025a5636a9
---
libswscale/utils.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/libswscale/utils.c b/libswscale/utils.c
index b4e230b..781f728 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -771,6 +771,15 @@ int sws_init_context(SwsContext *c, SwsFilter *srcFilter, SwsFilter *dstFilter)
unscaled = (srcW == dstW && srcH == dstH);
+ handle_jpeg(&srcFormat);
+ handle_jpeg(&dstFormat);
+
+ if(srcFormat!=c->srcFormat || dstFormat!=c->dstFormat){
+ av_log(c, AV_LOG_WARNING, "deprecated pixel format used, make sure you did set range correctly\n");
+ c->srcFormat= srcFormat;
+ c->dstFormat= dstFormat;
+ }
+
if (!sws_isSupportedInput(srcFormat)) {
av_log(c, AV_LOG_ERROR, "%s is not supported as input pixel format\n", av_get_pix_fmt_name(srcFormat));
return AVERROR(EINVAL);
More information about the ffmpeg-cvslog
mailing list