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

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 12 16:37:42 2014 +0100| [1203e92181b4c4af4ba1aa0edc1da3ae8447f9b4] | committer: Michael Niedermayer

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 at gmx.at>

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