diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 05:46:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-15 05:47:25 +0100 |
| commit | 27513846f66bfaf4dd38b819b71c4786075ee5d1 (patch) | |
| tree | 48d055b8aa18d3aadf7c7571795c2dc9c1cbbcce /libavcodec/mjpeg2jpeg_bsf.c | |
| parent | 5edbd4f4106fcff571c3f2c5a1f89534b5bd0307 (diff) | |
| parent | 928061670e873e816daa14827853b7e11221ff5f (diff) | |
| download | ffmpeg-27513846f66bfaf4dd38b819b71c4786075ee5d1.tar.gz | |
Merge commit '928061670e873e816daa14827853b7e11221ff5f'
* commit '928061670e873e816daa14827853b7e11221ff5f':
libswscale: GBRAP input & output and GBRAP16 input support
Conflicts:
libswscale/input.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
tests/ref/fate/filter-pixdesc-gbrap
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip
See: 5c057433ccd32f37ddc828d3f82c5b1ad7d3e3db
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg2jpeg_bsf.c')
0 files changed, 0 insertions, 0 deletions