Changeset 85bbe1db in ffmpeg

Timestamp:

May 12, 2015, 10:07:19 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2ce2462b

Parents:

acf4925f (diff), 0670acc (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> (05/12/15 10:06:35)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/12/15 10:07:19)

Message:

Merge commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9'

• commit '0670acc4f1c4ceb16968818a654e07a3f550a8c9': dca_parser: Extend DTS core sync word and fix existing check

Conflicts:

libavcodec/dca_parser.c

See: e80b2b9c81716a5d9f559c04cfe69d76b04e4cd3
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)