Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:46:56 +0000 (02:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 1 Jun 2015 00:46:56 +0000 (02:46 +0200)
commit211dcdca5cd98173b76ea219a119c412b6ba8635
treee1962225ecef547c477b9aab07e28448ca884f9f
parent1dc58965fd0f430c6020622842ff174feb352a7f
parent522d971c7f5921bebcea2fc50e67056afdabb951
Merge commit '522d971c7f5921bebcea2fc50e67056afdabb951'

* commit '522d971c7f5921bebcea2fc50e67056afdabb951':
  xsub: Check memory allocation

Conflicts:
libavcodec/xsubdec.c

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