diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 13:50:46 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-06 13:52:59 +0200 |
| commit | 911a100da9f5b32d4db8fe97913673e8b68de5f0 (patch) | |
| tree | 58a751e1b0698cbbefc291cfca8575a444e6b95e /COPYING.GPLv2 | |
| parent | 86ca6a7568498f1975f37a5b030261794c824945 (diff) | |
| parent | c16ddcc90b8be8d72efea3cc262c7354053916bc (diff) | |
| download | ffmpeg-911a100da9f5b32d4db8fe97913673e8b68de5f0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avisynth: K&R formatting cosmetics
Conflicts:
libavformat/avisynth.c
Nothing changed as the avisynth code has been rewritten to
support avi/avxsynth in ffmpeg.
And the new code should be free of formating problems.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv2')
0 files changed, 0 insertions, 0 deletions