diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 15:03:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-23 15:03:15 +0100 |
| commit | 8e09e183fc5fbddec153e41bb8f9b30eb6e11add (patch) | |
| tree | 15ef362af8657ad573185826617e56a257cc69e3 /libswscale/options.c | |
| parent | def18e5470bdcddb9d737784cc6ae427c195da7c (diff) | |
| parent | b6d7d4efae60845a93be6948ef78482bba1fc291 (diff) | |
| download | ffmpeg-8e09e183fc5fbddec153e41bb8f9b30eb6e11add.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
8bps: cosmetics
aasc: cosmetics, reformat
ansi: remove an extra return
asvdec: cosmetics, reformat
aura: cosmetics, reformat
Conflicts:
libavcodec/aasc.c
libavcodec/asvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/options.c')
0 files changed, 0 insertions, 0 deletions