diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 16:16:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 16:16:41 +0100 |
| commit | b14517d3cd3787f3c399f3ca7faf1a99a1066ff8 (patch) | |
| tree | 368cc144be79c3c7c4ef1a146c73b2ea19e53c64 /libswscale/input.c | |
| parent | 130c33af35c5d8798f70c62586ab228d4f8cd2a2 (diff) | |
| parent | 35b05c5184fb3aa1191e2d1e7f1cae1e11f344a4 (diff) | |
| download | ffmpeg-b14517d3cd3787f3c399f3ca7faf1a99a1066ff8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_interlace: deprecate lowpass option
Conflicts:
libavfilter/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/input.c')
0 files changed, 0 insertions, 0 deletions