Merge commit 'f1476459b7013d306eb911573f1dc81e74ccd082' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 04:43:42 +0000 (05:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 4 Feb 2014 04:43:42 +0000 (05:43 +0100)
commitfd856693defaa922dbee6a2fa90cc23f447cbaef
tree96b5b0b3a4077dfa8a6c7cc80b50131d038ea8e9
parenta5c3f596d1f7e092f928f48e8a21de5096d21e05
parentf1476459b7013d306eb911573f1dc81e74ccd082
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@gmx.at>
libavcodec/dsputil.c
libavcodec/flashsv.c
libavcodec/vmnc.c