Changeset 8aa6ffd8 in ffmpeg

Timestamp:

Oct 2, 2013, 12:53:00 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c28bca2b

Parents:

3841e451 (diff), cc41167a (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> (10/02/13 12:47:17)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/02/13 12:53:00)

Message:

Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'

• commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad': asfdec: Check the return value of asf_read_stream_properties

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

(No files)