Merge commit '858864d350320dd807e349bda017026e61a47fe0' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:19:54 +0000 (13:19 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 12 May 2013 11:19:54 +0000 (13:19 +0200)
commit63235b8d419d7250bdc3ff9067c0737a9fbe6ff7
tree00b47ad0fbbd22ab86030bb3f8e1a8b33eef636d
parent5353bd0285277df9d81d143c262c4698fba4dc6a
parent858864d350320dd807e349bda017026e61a47fe0
Merge commit '858864d350320dd807e349bda017026e61a47fe0' into release/1.1

* commit '858864d350320dd807e349bda017026e61a47fe0':
  xmv: check audio track parameters validity.
  bmv: check for len being valid in bmv_decode_frame().
  xmv: do not leak memory in the error paths in xmv_read_header()
  matroska: pass the lace size to the matroska_parse_rm_audio

Conflicts:
libavformat/matroskadec.c
libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/bmv.c
libavformat/matroskadec.c
libavformat/xmv.c