diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:52:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 20:52:40 +0200 |
| commit | 4917fecf4a005918d4f32b95683f392f0fae0b51 (patch) | |
| tree | ab2c05a687113f409b7c655fa7b9670d37b8d1eb /libswscale/bayer_template.c | |
| parent | a561662fb7223cb98907744e03398848a0d362e1 (diff) | |
| parent | bb789016d423d2cfacd2904ac66257bdf7f0964e (diff) | |
Merge commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e'
* commit 'bb789016d423d2cfacd2904ac66257bdf7f0964e':
swscale: Undeprecate sws_getContext()
Conflicts:
libswscale/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/bayer_template.c')
0 files changed, 0 insertions, 0 deletions