Changeset 0ecb3075 in ffmpeg

Timestamp:
Apr 7, 2014, 1:59:22 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
a6fa3a47
Parents:
a7a82f2f (diff), e10fd08a (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> (04/07/14 01:36:48)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (04/07/14 01:59:22)
Message:

Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'

Conflicts:

libavcodec/h264.c

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

(No files)

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