Merge commit '16e6652286213014c28a9c3af70435e767d28638'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 01:35:29 +0000 (03:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 22 Jul 2014 01:35:29 +0000 (03:35 +0200)
commitc933f2c4cca367eed87de92e059f222486b66309
tree0c5ff46211622b35173b33b8066a0c3f3d3313f1
parent135b1a3f2c7985b8336d170419aec6e30cd78043
parent16e6652286213014c28a9c3af70435e767d28638
Merge commit '16e6652286213014c28a9c3af70435e767d28638'

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

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/neon/mpegvideo.c