virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

swscale: move format handling to its own function

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-14 03:22:10 +02:00
parent fc6ca37316
commit d5f5e51662
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libswscale/utils.c
View File

@ -52,6 +52,8 @@
#include "swscale.h" #include "swscale.h"
#include "swscale_internal.h" #include "swscale_internal.h"
static void handle_formats(SwsContext *c);
unsigned swscale_version(void) unsigned swscale_version(void)
{ {
av_assert0(LIBSWSCALE_VERSION_MICRO >= 100); av_assert0(LIBSWSCALE_VERSION_MICRO >= 100);
@ -1039,6 +1041,14 @@ static int handle_xyz(enum AVPixelFormat *format)
} }
} }
static void handle_formats(SwsContext *c)
{
c->src0Alpha = handle_0alpha(&c->srcFormat);
c->dst0Alpha = handle_0alpha(&c->dstFormat);
c->srcXYZ = handle_xyz(&c->srcFormat);
c->dstXYZ = handle_xyz(&c->dstFormat);
}
SwsContext *sws_alloc_context(void) SwsContext *sws_alloc_context(void)
{ {
SwsContext *c = av_mallocz(sizeof(SwsContext)); SwsContext *c = av_mallocz(sizeof(SwsContext));
@ -1578,12 +1588,9 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat,
c->dstH = dstH; c->dstH = dstH;
c->srcRange = handle_jpeg(&srcFormat); c->srcRange = handle_jpeg(&srcFormat);
c->dstRange = handle_jpeg(&dstFormat); c->dstRange = handle_jpeg(&dstFormat);
c->src0Alpha = handle_0alpha(&srcFormat);
c->dst0Alpha = handle_0alpha(&dstFormat);
c->srcXYZ = handle_xyz(&srcFormat);
c->dstXYZ = handle_xyz(&dstFormat);
c->srcFormat = srcFormat; c->srcFormat = srcFormat;
c->dstFormat = dstFormat; c->dstFormat = dstFormat;
handle_formats(c);
if (param) { if (param) {
c->param[0] = param[0]; c->param[0] = param[0];
@ -2022,15 +2029,12 @@ struct SwsContext *sws_getCachedContext(struct SwsContext *context, int srcW,
context->srcW = srcW; context->srcW = srcW;
context->srcH = srcH; context->srcH = srcH;
context->srcRange = handle_jpeg(&srcFormat); context->srcRange = handle_jpeg(&srcFormat);
context->src0Alpha = handle_0alpha(&srcFormat);
context->srcXYZ = handle_xyz(&srcFormat);
context->srcFormat = srcFormat; context->srcFormat = srcFormat;
context->dstW = dstW; context->dstW = dstW;
context->dstH = dstH; context->dstH = dstH;
context->dstRange = handle_jpeg(&dstFormat); context->dstRange = handle_jpeg(&dstFormat);
context->dst0Alpha = handle_0alpha(&dstFormat);
context->dstXYZ = handle_xyz(&dstFormat);
context->dstFormat = dstFormat; context->dstFormat = dstFormat;
handle_formats(context);
context->flags = flags; context->flags = flags;
context->param[0] = param[0]; context->param[0] = param[0];
context->param[1] = param[1]; context->param[1] = param[1];