diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-15 12:10:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-15 12:10:08 +0100 |
| commit | 61fbb4cd57d7bd280c6645df98acdacfe6004a88 (patch) | |
| tree | 52c35fd93bdfc3b30d6b284e59e9362131b49962 /libavutil/opt.h | |
| parent | 75758f84def252a228a80a2e08d0c9ed7fce8df4 (diff) | |
| parent | 4db96649ca700db563d9da4ebe70bf9fc4c7a6ba (diff) | |
| download | ffmpeg-61fbb4cd57d7bd280c6645df98acdacfe6004a88.tar.gz | |
Merge commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba'
* commit '4db96649ca700db563d9da4ebe70bf9fc4c7a6ba':
avutil: Ensure that emms_c is always defined, even on non-x86
configure: Move MinGW CPPFLAGS setting to libc section, where it belongs
avutil: Move emms code to x86-specific header
Conflicts:
configure
libavutil/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.h')
0 files changed, 0 insertions, 0 deletions