Merge commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f'

* commit '27aa1ff35a13bc471c6e0a9cc496ec3f62f1574f':
  oggdec: Check memory allocation

Conflicts:
	libavformat/oggdec.c

See: 9b8152bf04 an others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-22 04:00:56 +01:00
commit cff55cfe17

Diff Content Not Available