[FFmpeg-cvslog] Merge commit '7933039ade01b39638ec3d9e638b6ae06ee84984' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar  3 23:16:15 2014 +0100| [222e7549a74d75fcf91440ebcff997ee5416296d] | committer: Michael Niedermayer

Merge commit '7933039ade01b39638ec3d9e638b6ae06ee84984' into release/2.2

* commit '7933039ade01b39638ec3d9e638b6ae06ee84984':
  af_resample: preserve frame properties
  avconv: Do not divide by zero
  dca: replace some memcpy by AV_COPY128
  h264: avoid undefined behavior in chroma motion compensation
  x86: dsputil: Use correct file name as multiple inclusion guard

Conflicts:
	ffmpeg.c

All changes are already in our 2.2 branch, this is just for metadata

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

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