Changeset 3e8b17f0 in ffmpeg

Timestamp:

Feb 12, 2014, 3:36:15 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c3204856

Parents:

f73901f8 (diff), f5d92d9c (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> (02/12/14 15:36:04)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/12/14 15:36:15)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: asfdec: fix seeking with fragmented packets

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

(No files)