Changeset 5c14b282 in ffmpeg

Timestamp:

Jun 16, 2012, 9:22:42 PM (12 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

17fad33f

Parents:

9946a6aa (diff), ae702edf (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> (06/16/12 21:22:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/16/12 21:22:42)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: flacdec: read attached pictures. lavf: don't segfault when a NULL filename is passed to avformat_open_input()

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

(No files)