diff options
| author | Michael Niedermayer <[email protected]> | 2013-08-16 12:38:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-08-16 12:40:32 +0200 |
| commit | 1ef0b8f9cc072be5b70af100b6d63dbbcc9cc260 (patch) | |
| tree | 23ab8275f66acfa5da4abc88e03737e9159b3f15 /libavfilter/af_join.c | |
| parent | 7372177a08c0fda59bc01abe44199b68953c3c70 (diff) | |
| parent | d258531502b24cb653204fe4f003c8815755bdc4 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavfilter/af_join.c')
0 files changed, 0 insertions, 0 deletions