[FFmpeg-cvslog] Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Feb  7 13:09:35 2013 +0100| [c4e394e46008c9e208f666d156f49f7ba500d73a] | committer: Michael Niedermayer

Merge commit '79dad2a932534d1155079f937649e099f9e5cc27'

* commit '79dad2a932534d1155079f937649e099f9e5cc27':
  dsputil: Separate h264chroma

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/ppc/dsputil_ppc.c
	libavcodec/vc1dec.c
	libavcodec/vc1dsp.c

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

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