diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 12:53:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 12:56:48 +0200 |
| commit | c14fc4585c2b8636ae0609582456c78097ea82c9 (patch) | |
| tree | ccfd862de19247e32e5a7b40bf9769a41c26cb84 /libavcodec/intrax8.c | |
| parent | 1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260 (diff) | |
| parent | aa2ba8c99e5708884a56aea9c1d96e014866f8a3 (diff) | |
Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'
* commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3':
swscale: Move extern declarations for tables to swscale_internal.h
Conflicts:
libswscale/output.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/intrax8.c')
0 files changed, 0 insertions, 0 deletions