diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 13:56:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-19 13:56:29 +0200 |
| commit | 776647360db37628ccfcaf9a624544b2be45eb7a (patch) | |
| tree | 540ad3ad2b6e8793bc50e7d8e9708fe473c924ca /libavutil/murmur3.c | |
| parent | 6da96a9fc9cf423994eb6b16c241788c759444f4 (diff) | |
| parent | 5dcc201505f71b1e73e9eef12ce89d4eed252ad0 (diff) | |
| download | ffmpeg-776647360db37628ccfcaf9a624544b2be45eb7a.tar.gz | |
Merge commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0'
* commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0':
simple_idct: Move x86-specific declarations to a header in the x86 directory
Conflicts:
libavcodec/x86/simple_idct.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/murmur3.c')
0 files changed, 0 insertions, 0 deletions