Michael Niedermayer 672c610d84 Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c' ...

* commit 'f9279ee74936b4990fc46287c27816ef828cc06c':
  dsputil: Move ff_zigzag_direct and ff_crop_tab declarations to mathops.h

Conflicts:
	libavcodec/imgconvert.c

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

2014-03-22 22:23:04 +01:00

..

dsputil_init.c

Merge commit '82bb3048013201c0095d2853d4623633d912252f'

2014-03-20 22:36:40 +01:00

dsputil.S

Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'

2014-03-14 02:12:45 +01:00

fdct_bfin.S

Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'

2014-03-14 01:56:25 +01:00

hpel_pixels_no_rnd.S

Merge commit '929ec39ec4497827f7530f2aaa31646ef35462ee'

2014-03-14 02:06:21 +01:00

hpeldsp_init.c

Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'

2014-03-14 02:12:45 +01:00

idct_bfin.S

Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'

2014-03-14 01:56:25 +01:00

Makefile

dsputil: Conditionally compile dsputil code on all architectures

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

mathops.h

…

pixels.h

Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'

2014-03-14 02:12:45 +01:00

pixels.S

Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'

2014-03-14 02:12:45 +01:00

vp3dsp_init.c

Merge commit 'f9279ee74936b4990fc46287c27816ef828cc06c'

2014-03-22 22:23:04 +01:00

vp3dsp.S

Merge commit 'eb2b8bce39c93d16a02656238248c6cf697f447f'

2014-03-14 02:12:45 +01:00