Merge commit '684e3d2e1ce96625eeef63f2564aab66f6715d05'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 01:02:00 +0000 (02:02 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 01:02:06 +0000 (02:02 +0100)
commite5949cc12a7af107e4d4265d711fe77278cce5c9
treee07e576ab7c30608d68674172d359c6468d10c88
parentff3e8564c440b03dc9cf72f3a7536fe4880ad72e
parent684e3d2e1ce96625eeef63f2564aab66f6715d05
Merge commit '684e3d2e1ce96625eeef63f2564aab66f6715d05'

* commit '684e3d2e1ce96625eeef63f2564aab66f6715d05':
  ra144: check buffer size before requesting a buffer
  wmapro: unref skipped frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ra144dec.c
libavcodec/wmaprodec.c