Merge commit '443502aed8b814d883825e52e91e4f018955aa66'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 22:06:44 +0000 (23:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 11 Nov 2014 22:08:55 +0000 (23:08 +0100)
commit287eb69973f8066a68e924bdf9433b2faad01dfa
treee9741a866e820b7758d4f495be1a911544555dee
parente0c36f58257f015296a391c5bac763f1aec9a6e2
parent443502aed8b814d883825e52e91e4f018955aa66
Merge commit '443502aed8b814d883825e52e91e4f018955aa66'

* commit '443502aed8b814d883825e52e91e4f018955aa66':
  dvbsubdec: move shared codepath

Conflicts:
libavcodec/dvbsubdec.c

The merged code is ignored and the factorization redone with
the code that is in FFmpeg.

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