[FFmpeg-cvslog] Merge commit '702458538d4e52809bcef460d39baabf061b16b5'

Michael Niedermayer git at videolan.org
Mon Feb 16 02:29:06 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Feb 16 02:16:29 2015 +0100| [e86f754b1c5f1e0d2e04e2f2c20885706ae50366] | committer: Michael Niedermayer

Merge commit '702458538d4e52809bcef460d39baabf061b16b5'

* commit '702458538d4e52809bcef460d39baabf061b16b5':
  g722: Add ARM NEON implementation for g722_apply_qmf()

Conflicts:
	libavcodec/arm/Makefile

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

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





More information about the ffmpeg-cvslog mailing list