diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-30 11:23:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-30 11:23:32 +0100 |
| commit | 8ccc58bb7d72938986745042741f8670a08a082c (patch) | |
| tree | b70b2dc54c723dccf824cb051d6d89ffcf3f3770 /COPYING.GPLv3 | |
| parent | d890db5f537bdfc9d73e7fdac1ff4216e5a43fc2 (diff) | |
| parent | 9a4c10e3af011dd84d3135090d3ca4212cbad127 (diff) | |
| download | ffmpeg-8ccc58bb7d72938986745042741f8670a08a082c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavu: Move preprocessor macros in a separate file
Conflicts:
libavutil/avutil.h
libavutil/utils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions