Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:42:08 +0000 (21:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 20:42:36 +0000 (21:42 +0100)
commit575ed4fe37fdb1558fbbc261661b6239d47bcd8c
tree0113e668e92ff3f8197e823d72f15ee37598761a
parentbeae6ac5db9deee4a93a0c8e6e965ed31463ab93
parentda7e31a240f276836a0b90ca6c0714181b353cc4
Merge commit 'da7e31a240f276836a0b90ca6c0714181b353cc4'

* commit 'da7e31a240f276836a0b90ca6c0714181b353cc4':
  rmdec: Check memory allocations from ff_rm_alloc_rmstream()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rdt.c
libavformat/rmdec.c