Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:42:16 +0000 (11:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 23 Feb 2015 10:42:16 +0000 (11:42 +0100)
commit96b495f443832082777d7dad7349dd6ec97b6cb9
tree67c21ef1c8441d60dcc7054cae839b451d448a75
parent0425e16d96cccf6de32231ecfc37cde72985dde5
parente570f895cdccf2535a71fec1c607751ddb94fd5a
Merge commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a'

* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
  libschroedinger: Check memory allocations

Conflicts:
libavcodec/libschroedinger.c

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