Changeset b594aceb in ffmpeg

Timestamp:
Nov 1, 2013, 4:33:05 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
3a0c9026
Parents:
3552bd93 (diff), 58466462 (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> (11/01/13 16:31:18)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (11/01/13 16:33:05)
Message:

Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

Conflicts:

Changelog
libavformat/hevcdec.c
libavformat/version.h

See: 902a5fa7228d92bf7e0a8f523a25cf72d31afab4 and later commits
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)

Note: See TracChangeset for help on using the changeset viewer.