diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 13:18:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-20 13:18:59 +0200 |
| commit | 6912e7a008acd1464a63b0a00779a3de81b9a8ab (patch) | |
| tree | 67af44d73c8fa23fb60f92898067a98dce3e2390 /ffmpeg_opt.c | |
| parent | 04c6ecb7da677049cd52efe2a980e586167e9e5d (diff) | |
| parent | 79042ab37619a234d5fe0f680885a392e966ea6b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: Group math functions into a separate variable
avutil/mem: K&R formatting cosmetics
avutil/lzo: K&R formatting cosmetics
Conflicts:
configure
libavutil/mem.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions