Changeset d938a013 in ffmpeg

Timestamp:

Jan 14, 2014, 8:54:11 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

84ca7c28

Parents:

1171ad64 (diff), aa0cb16c (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> (01/14/14 20:53:12)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (01/14/14 20:54:11)

Message:

Merge commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084'

• commit 'aa0cb16c15a5b30f78542f18e3fa65de005cf084': mxf: Fix off by one error in d10 aes3 decoding

Conflicts:

libavformat/mxfdec.c

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

(No files)