Michael Niedermayer 776647360d 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>

2014-07-19 13:56:29 +02:00

2.1 KiB

Raw Blame History

View Raw