[FFmpeg-cvslog] Merge commit 'cb5d0ea0bec119ecbe327bd7d3834987ab42ec1a' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 10 18:06:35 2014 +0100| [b7a750f67f68b41d5f3215906a5282b9cb7937d3] | committer: Michael Niedermayer

Merge commit 'cb5d0ea0bec119ecbe327bd7d3834987ab42ec1a' into release/0.10

* commit 'cb5d0ea0bec119ecbe327bd7d3834987ab42ec1a':
  flashsv: Check diff_start diff_height values
  dsputil/pngdsp: fix signed/unsigned type in end comparison
  vqavideo: check chunk sizes before reading chunks
  avi: directly resync on DV in AVI read failure
  get_bits: change the failure condition in init_get_bits
  twinvq: Cope with gcc-4.8.2 miscompilation

Conflicts:
	libavcodec/dsputil.c
	libavcodec/flashsv.c
	libavcodec/get_bits.h

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

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