Changeset 6b1ca170 in ffmpeg

Timestamp:
Mar 17, 2014, 1:41:13 PM (11 years ago)
Author:
Michael Niedermayer <michaelni@gmx.at>
Branches:
master
Children:
85d28a86
Parents:
ad9a6e19 (diff), 1481d24c (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> (03/17/14 13:14:10)
git-committer:
Michael Niedermayer <michaelni@gmx.at> (03/17/14 13:41:13)
Message:

Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'

Conflicts:

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

See: 9569a3c9f41387a8c7d1ce97d8693520477a66c3
See: 92afb431621c79155fcb7171d26f137eb1bee028, as well as others
Note: the enum values added in libav are incompatible/different to what ffmpeg used since 3 years
Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)

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