diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 22:14:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-31 22:14:39 +0200 |
| commit | 8dcbfb73d58c06fa012db5ffea97647fed95a280 (patch) | |
| tree | c727fbe254633fac4c8116360a9e71dfd7392b6e /libavformat/rtpdec_formats.h | |
| parent | 47cc1a2bf1b757dc388cd47f43dc64e5cc543918 (diff) | |
| parent | 3058872c293e239e3b51e86fe18cfbe720aadff1 (diff) | |
| download | ffmpeg-8dcbfb73d58c06fa012db5ffea97647fed95a280.tar.gz | |
Merge commit '3058872c293e239e3b51e86fe18cfbe720aadff1'
* commit '3058872c293e239e3b51e86fe18cfbe720aadff1':
ppc: Clarify and extend the cpuid check
Conflicts:
libavutil/ppc/cpu.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_formats.h')
0 files changed, 0 insertions, 0 deletions