[FFmpeg-cvslog] Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul  5 18:54:09 2014 +0200| [6bef3e55bdc743ea81694c90f443ac2a089ddabc] | committer: Michael Niedermayer

Merge commit '009331303a6462d07cbe94aef9c446f1a1695519'

* commit '009331303a6462d07cbe94aef9c446f1a1695519':
  x86: huffyuvdsp: Move inline assembly to init file

Conflicts:
	libavcodec/x86/Makefile
	libavcodec/x86/huffyuvdsp.h
	libavcodec/x86/huffyuvdsp_init.c
	libavcodec/x86/huffyuvdsp_mmx.c

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

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