diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:26:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-13 01:26:49 +0200 |
| commit | 28875c418886e1576b657882ee2b969de85041a0 (patch) | |
| tree | ce73485cdc210515b928f60baa63f9029fc54a26 /libswscale/swscale_unscaled.c | |
| parent | d3284a62082b8224d2a31e050f160ccda9ce2487 (diff) | |
| parent | 60c4660ba035bbfbcc84ac34129ce40e037c70ad (diff) | |
Merge commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad'
* commit '60c4660ba035bbfbcc84ac34129ce40e037c70ad':
swscale: fix an implementation-defined unsigned-to-signed conversion
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale_unscaled.c')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 8eace667e4..18c35429f9 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1755,7 +1755,6 @@ void ff_get_unscaled_swscale(SwsContext *c) ff_get_unscaled_swscale_ppc(c); // if (ARCH_ARM) // ff_get_unscaled_swscale_arm(c); - } /* Convert the palette to the same packed 32-bit format as the palette */ |