Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Sep 2011 20:37:31 +0000 (22:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 8 Sep 2011 20:37:31 +0000 (22:37 +0200)
* qatar/master:
  Employ FF_ARRAY_ELEMS instead of manually calculating array length.
  Fixed invalid access in wavpack decoder on corrupted bitstream.
  Fixed invalid writes in wavpack decoder on corrupted bitstreams.
  Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
  rtpdec_asf: Fix integer underflow that could allow remote code execution

Conflicts:
libavformat/rtpdec_asf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/wavpack.c
libavformat/avlanguage.c
libavformat/mxf.c
libavformat/rtpdec_asf.c

Simple merge
Simple merge
Simple merge
Simple merge