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)
commit78d7d8fe9170f38ee0b2ab6f731ff1a61c712db5
tree3fa4f47e3f1cca5a0cf39b42a5d171dec9a5b53f
parent04c13dca8812e8302686887b6e8201d4ad25b7d8
parent6376362d15ccbc02e15d0b3b7a7a5d862efd6b91
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/wavpack.c
libavformat/avlanguage.c
libavformat/mxf.c
libavformat/rtpdec_asf.c