[FFmpeg-cvslog] Merge commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 15:51:22 2013 +0100| [f506ae19ffb5ad1366a889b4dbec16254db4b755] | committer: Michael Niedermayer

Merge commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9'

* commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9':
  ffv1: fix calculating slice dimensions for version 2

Conflicts:
	libavcodec/ffv1dec.c

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

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