Michael Niedermayer c933f2c4cc Merge commit '16e6652286213014c28a9c3af70435e767d28638' ...

* commit '16e6652286213014c28a9c3af70435e767d28638':
  aarch64: NEON intrinsics dct_unquantize_h263.

Conflicts:
	libavcodec/mpegvideo.c

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

2014-07-22 03:35:29 +02:00

..

Makefile

…

mpegvideo.c

…