Changeset ed8c34a7 in ffmpeg

Timestamp:

Jul 18, 2013, 4:10:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

99de97ca

Parents:

7203dbde (diff), b39a6bbe (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> (07/18/13 16:10:41)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/18/13 16:10:45)

Message:

Merge remote-tracking branch 'cehoyos/master'

• cehoyos/master: Fix pix_fmt detection in the native jpeg2000 decoder. lavf/concat: Never fail for sample aspect ratio 0:1. lut3d: Fix reading 3dl files with leading comments.

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

(No files)