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 /libavcodec/x86/simple_idct.c | |
| parent | 6da96a9fc9cf423994eb6b16c241788c759444f4 (diff) | |
| parent | 5dcc201505f71b1e73e9eef12ce89d4eed252ad0 (diff) | |
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 'libavcodec/x86/simple_idct.c')
| -rw-r--r-- | libavcodec/x86/simple_idct.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/x86/simple_idct.c b/libavcodec/x86/simple_idct.c index bebc509f64..6b4bd1852e 100644 --- a/libavcodec/x86/simple_idct.c +++ b/libavcodec/x86/simple_idct.c @@ -19,10 +19,11 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavcodec/simple_idct.h" + #include "libavutil/mem.h" #include "libavutil/x86/asm.h" #include "idctdsp.h" +#include "simple_idct.h" #if HAVE_INLINE_ASM |