Changeset 85f8a3cb in ffmpeg

Timestamp:
Sep 22, 2013, 9:42:03 AM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
361bc707
Parents:
8310bccc (diff), e208e6d2 (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> (09/22/13 09:37:09)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (09/22/13 09:42:03)
Message:

Merge commit 'e208e6d209728d332343aa5390ae377ac0a6305c'

Conflicts:

doc/APIchanges
libavutil/pixdesc.c
libavutil/pixfmt.h
libavutil/version.h

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

(No files)

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