[FFmpeg-cvslog] Merge commit 'f1476459b7013d306eb911573f1dc81e74ccd082' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  4 05:43:42 2014 +0100| [fd856693defaa922dbee6a2fa90cc23f447cbaef] | committer: Michael Niedermayer

Merge commit 'f1476459b7013d306eb911573f1dc81e74ccd082' into release/1.1

* commit 'f1476459b7013d306eb911573f1dc81e74ccd082':
  vmnc: K&R formatting cosmetics
  flashsv: Check diff_start diff_height values
  dsputil/pngdsp: fix signed/unsigned type in end comparison

Conflicts:
	libavcodec/dsputil.c
	libavcodec/flashsv.c
	libavcodec/vmnc.c

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

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