Changeset 2e6338b4 in ffmpeg

Timestamp:

Jul 10, 2013, 2:00:57 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b050956, c9eb5c97

Parents:

bc95b942 (diff), 4ecdb5ed (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/10/13 13:47:50)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/10/13 14:00:57)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: qdm2: Conceal broken samples

See: 5ee008e01d5a50d976b5f2a4abd6932185672d91

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

(No files)