[FFmpeg-cvslog] Merge commit '16e6652286213014c28a9c3af70435e767d28638'

Michael Niedermayer git at videolan.org
Tue Jul 22 04:46:09 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 22 03:35:29 2014 +0200| [c933f2c4cca367eed87de92e059f222486b66309] | committer: Michael Niedermayer

Merge commit '16e6652286213014c28a9c3af70435e767d28638'

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

Conflicts:
	libavcodec/mpegvideo.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c933f2c4cca367eed87de92e059f222486b66309
---





More information about the ffmpeg-cvslog mailing list