diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 00:14:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-16 00:15:16 +0100 |
| commit | 3e486162267f1de4447dc6e6bd45ac666647ba7e (patch) | |
| tree | 17c0968c01c1e09c4a792a579950095e7ba1f15e /libswscale | |
| parent | 4f3f5ee1ac93797954eb66ef4d19e2256c0aaee7 (diff) | |
| parent | 9a60b1fad02cb783b895b2145c3dafc01f7b337c (diff) | |
| download | ffmpeg-streaming-3e486162267f1de4447dc6e6bd45ac666647ba7e.zip ffmpeg-streaming-3e486162267f1de4447dc6e6bd45ac666647ba7e.tar.gz | |
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>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 91bfe18..dff44dd 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -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; |
