diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 12:38:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-16 12:40:32 +0200 |
| commit | 1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260 (patch) | |
| tree | 23ab8275f66acfa5da4abc88e03737e9159b3f15 /libswscale/output.c | |
| parent | 7372177a08c0fda59bc01abe44199b68953c3c70 (diff) | |
| parent | d258531502b24cb653204fe4f003c8815755bdc4 (diff) | |
| download | android_external_ffmpeg-1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260.tar.gz android_external_ffmpeg-1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260.tar.bz2 android_external_ffmpeg-1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260.zip | |
Merge commit 'd258531502b24cb653204fe4f003c8815755bdc4'
* commit 'd258531502b24cb653204fe4f003c8815755bdc4':
swscale: Mark a bunch of tables only used within one file static
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/output.c')
0 files changed, 0 insertions, 0 deletions