Changeset 47cc6168 in ffmpeg

Timestamp:

Dec 17, 2013, 4:58:53 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b22989da

Parents:

c90f3114 (diff), 6fd99e78 (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> (12/17/13 16:58:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/17/13 16:58:53)

Message:

Merge commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c'

• commit '6fd99e78def3c795bdd0bc31f3ae0998d24bc94c': png: add a standalone parser

Conflicts:

Changelog
libavcodec/png_parser.c
libavcodec/version.h

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

(No files)