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)
* commit 'e570f895cdccf2535a71fec1c607751ddb94fd5a':
  libschroedinger: Check memory allocations

Conflicts:
libavcodec/libschroedinger.c

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

Simple merge
Simple merge