MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c' 

* commit '9a60b1fad02cb783b895b2145c3dafc01f7b337c':
  libswscale: fix compiler warnings enumerated type mixed with another type

Conflicts:
	libswscale/swscale_unscaled.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-16 00:14:30 +01:00
parent 4f3f5ee1ac 9a60b1fad0
commit 3e48616226
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libswscale/swscale.c
View File

@ -742,7 +742,7 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
return swscale;
}
static void reset_ptr(const uint8_t *src[], int format)
static void reset_ptr(const uint8_t *src[], enum AVPixelFormat format)
{
if (!isALPHA(format))
src[3] = NULL;