Merge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:14:57 +0000 (02:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:15:10 +0000 (02:15 +0100)
commitc2b658c0e7b7555c5dbf0b05d437fe35b5e9cd84
treeb8750581e34e9a96eb92bdc4e88cb5382b48ad55
parentf251409adc046881ddff4d0c2bedeae69ae83675
parent5891fd017aa7bed4c423b8511090cf8641a0afa4
Merge commit '5891fd017aa7bed4c423b8511090cf8641a0afa4' into release/2.4

* commit '5891fd017aa7bed4c423b8511090cf8641a0afa4':
  dvdsubdec: Do not leak on failure path

Conflicts:
libavcodec/dvdsubdec.c

See: 7fa9f7ef1c2f0cee81ec6ea6a4ff10af4c4fc62c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dvdsubdec.c