Changeset 6998400c in ffmpeg

Timestamp:

Feb 14, 2015, 8:27:44 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d8901c2f

Parents:

a94eba6f (diff), bf704132 (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/14/15 20:27:26)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/14/15 20:27:44)

Message:

Merge commit 'bf704132a51f5d838365158331d4e535e1df4c8e'

• commit 'bf704132a51f5d838365158331d4e535e1df4c8e': Don't anonymously typedef structs

Conflicts:

avprobe.c
libavutil/parseutils.c

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

(No files)