diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 18:11:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-02 18:25:15 +0200 |
| commit | 0652ffc69a99683a4e6e86e5550824c878a75c73 (patch) | |
| tree | 06dc03ddbe42bbd0c64a5fc213cec80d4e80fdcd /libswscale/rgb2rgb.c | |
| parent | 91a0d3af651732d80b5c01777ea1c7ec541ec554 (diff) | |
| parent | b33c64e4c2e0fd2484352c5eef3c667ad094ca27 (diff) | |
| download | ffmpeg-0652ffc69a99683a4e6e86e5550824c878a75c73.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vf_settb: rename to settb
Conflicts:
libavfilter/Makefile
libavfilter/f_settb.c
libavfilter/settb.c
libavfilter/vf_settb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/rgb2rgb.c')
0 files changed, 0 insertions, 0 deletions