Merge commit '15c2e8027f4827018608badb1bff1294af1810e4' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Oct 2012 14:29:54 +0000 (16:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 25 Oct 2012 14:29:54 +0000 (16:29 +0200)
commit36487066ee044d580ce2fdf7aa3989a0036e9313
tree5ce45d234b430c833a49b36cf522745e002eee85
parentfe8243d7a9e3dae000389ca2020f26679c779f04
parent15c2e8027f4827018608badb1bff1294af1810e4
Merge commit '15c2e8027f4827018608badb1bff1294af1810e4' into release/0.10

* commit '15c2e8027f4827018608badb1bff1294af1810e4':
  wav: do not fail on empty INFO tags
  cavsdec: check for changing w/h.
  indeo4: update AVCodecContext width/height on size change
  avidec: use actually read size instead of requested size
  wmaprodec: check num_vec_coeffs for validity
  lagarith: check count before writing zeros.
  indeo3: fix out of cell write.
  indeo5: check tile size in decode_mb_info().
  indeo5: prevent null pointer dereference on broken files
  indeo5dec: Make sure we have had a valid gop header.
  indeo4/5: check empty tile size in decode_mb_info().
  ivi_common: make ff_ivi_process_empty_tile() static.

Conflicts:
libavcodec/indeo5.c
libavformat/wav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/cavsdec.c
libavcodec/indeo3.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/ivi_common.h
libavcodec/lagarith.c
libavcodec/wmaprodec.c
libavformat/avidec.c
libavformat/wav.c