Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 07:56:56 +0000 (09:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 08:06:42 +0000 (10:06 +0200)
* commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937':
  oggparsevorbis: fail on memory allocation error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/oggparsevorbis.c

Simple merge