Changeset 287eb699 in ffmpeg

Timestamp:

Nov 11, 2014, 10:08:55 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

70cbb473

Parents:

e0c36f58 (diff), 443502a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (11/11/14 22:06:44)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/11/14 22:08:55)

Message:

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>

(No files)