[FFmpeg-cvslog] Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 16:15:08 2013 +0100| [7787a6c7caa0a3bdca3b479286def754e6f56cf0] | committer: Michael Niedermayer

Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'

* commit 'cacad1c058f66558ec727faac3b277d2dee264d4':
  wmaprodec: require block_align to be set.
  wmadec: require block_align to be set.
  ivi_common: do not call MC for intra frames when dc_transform is unset

Conflicts:
	libavcodec/ivi_common.c

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

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