Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 20:58:38 +0000 (21:58 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Mar 2015 21:01:57 +0000 (22:01 +0100)
commit8b3a681aaa7dc209faa698c189d9b28c102bdc63
tree0ad814709cffa98fed8627f565755423f0a1a554
parent98c387c9c1cd8337b63e6e6544319127f6e82f94
parent5a2645cafeca1c2207ac55cc831c3349572a82ed
Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'

* commit '5a2645cafeca1c2207ac55cc831c3349572a82ed':
  nutdec: Prevent leaks on memory error

Conflicts:
libavformat/nutdec.c

See: 269845db86d994c7d43c3ad6eabd4fde5bb391ea
Merged-by: Michael Niedermayer <michaelni@gmx.at>