diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 13:15:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 17:46:19 +0200 |
| commit | 3428a9b8d5ae8ad6d98633f7c4977adbe7c990bd (patch) | |
| tree | 86aa7173eddd1aa50174e446f44824969f9fcf6b /libavfilter/opencl_allkernels.c | |
| parent | cecb6d6f83f2d8c23fbd11d5a3937fefc2380f2c (diff) | |
| parent | 0ca0924c10d9617a5793964bf79655424ef32b68 (diff) | |
| download | ffmpeg-3428a9b8d5ae8ad6d98633f7c4977adbe7c990bd.tar.gz | |
Merge commit '0ca0924c10d9617a5793964bf79655424ef32b68'
* commit '0ca0924c10d9617a5793964bf79655424ef32b68':
swscale: add endianness conversion for AV_PIX_FMT_BGRA64|RGBA64
Conflicts:
libswscale/swscale_unscaled.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/opencl_allkernels.c')
0 files changed, 0 insertions, 0 deletions