Merge commit 'cb5d0ea0bec119ecbe327bd7d3834987ab42ec1a' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 17:06:35 +0000 (18:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Mar 2014 17:06:35 +0000 (18:06 +0100)
* 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@gmx.at>
1  2 
libavcodec/dsputil.c
libavcodec/flashsv.c
libavcodec/get_bits.h
libavcodec/twinvq.c
libavcodec/vqavideo.c
libavformat/avidec.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge