Changeset f275f9ea in ffmpeg

Timestamp:
May 22, 2015, 8:39:47 PM (10 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
ebb0ca3d
Parents:
179527f3 (diff), 4e17946f (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> (05/22/15 19:25:57)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (05/22/15 20:39:47)
Message:

Merge commit '4e17946f10d39eec6cc03fb249ae8147373141b6'

Conflicts:

libavcodec/mpegvideo.c

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

(No files)

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