Merge commit '0358a099f8abe60230dc2e5bec59bfceb7d1be07' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 15:37:42 +0000 (16:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 Jan 2014 15:37:42 +0000 (16:37 +0100)
commit1203e92181b4c4af4ba1aa0edc1da3ae8447f9b4
treeed47a7289f23930c320d3d9b4e6b6996cf6eff29
parentc693ccb89a9ed81b90901d958f8e72a7179c7242
parent0358a099f8abe60230dc2e5bec59bfceb7d1be07
Merge commit '0358a099f8abe60230dc2e5bec59bfceb7d1be07' into release/1.1

* commit '0358a099f8abe60230dc2e5bec59bfceb7d1be07':
  indeo4: Check the block size if reusing the band configuration
  ffv1: Assume bitdepth 0 means 8bit
  alsa-audio-dec: explicitly cast the delay to a signed int64
  matroskadec: pad EBML_BIN data.
  motionpixels: clip VLC codes.
  avidec: fix a memleak in the dv init code.

Conflicts:
libavcodec/ffv1dec.c
libavcodec/indeo4.c
libavdevice/alsa-audio-dec.c
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/indeo4.c
libavcodec/motionpixels.c