Michael Niedermayer 011d83de48 Merge commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18' ...

* commit '0e083d7e43805db1a978cb57bfa25fda62e8ff18':
  build: Group general components separate from de/encoders in arch Makefiles

Conflicts:
	libavcodec/arm/Makefile
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-03-20 22:26:31 +01:00

..

cabac.h

Merge commit 'dfe224f377be3e45758c69d881ca7874b82d647a'

2014-03-09 13:27:04 +01:00

h264chroma_init_aarch64.c

…

h264cmc_neon.S

…

h264dsp_init_aarch64.c

Merge commit 'f896bca03fc63b93851c1c14c9321c20b3cd44a6'

2014-01-15 15:36:37 +01:00

h264dsp_neon.S

Merge commit 'f896bca03fc63b93851c1c14c9321c20b3cd44a6'

2014-01-15 15:36:37 +01:00

h264idct_neon.S

Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'

2014-02-20 23:13:13 +01:00

h264qpel_init_aarch64.c

Merge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'

2014-01-15 15:20:30 +01:00

h264qpel_neon.S

Merge commit 'd5dd8c7bf0f0d77c581db3236e0d938f06fd5591'

2014-01-15 15:13:41 +01:00

hpeldsp_init_aarch64.c

Merge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'

2014-01-15 15:20:30 +01:00

hpeldsp_neon.S

Merge commit 'c65d67ef50241886b9749e88fd333c52090f70c7'

2014-01-15 15:20:30 +01:00

Makefile

build: Group general components separate from de/encoders in arch Makefiles

2014-03-20 05:03:23 -07:00

neon.S

Merge commit '36e3b1f2fd262028834a9d7b1eb533c1218ee6c2'

2014-01-15 15:27:26 +01:00

neontest.c

Merge remote-tracking branch 'qatar/master'

2014-01-15 15:49:22 +01:00

rv40dsp_init_aarch64.c

…

vc1dsp_init_aarch64.c

…