-
Michael Niedermayer authored
* commit '443502ae': 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>
287eb699