-
Michael Niedermayer authored
* commit '253d0be6': pgssubdec: handle more complex PGS scenarios Conflicts: libavcodec/pgssubdec.c Some of this has been split out and commited in cleanly split patches immedeately before this merge Merged-by:
Michael Niedermayer <michaelni@gmx.at>
ae9a73de