Changeset 70cbb473 in ffmpeg

Timestamp:

Nov 11, 2014, 10:16:50 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

69b2d43

Parents:

287eb699 (diff), 60b05513 (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:16:15)

git-committer:

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

Message:

Merge commit '60b055133485891405722bc9722e2c74fc9764b8'

• commit '60b055133485891405722bc9722e2c74fc9764b8': png_parser: fix size of chunk_lenght

Conflicts:

libavcodec/png_parser.c

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

(No files)