Changeset d280d43 in ffmpeg

Timestamp:

Mar 24, 2015, 12:47:01 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

3e399561

Parents:

cceb7379 (diff), 592a0405 (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/24/15 00:45:43)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/24/15 00:47:01)

Message:

Merge commit '592a04054e6423be5050efd2bceece48b10b9c1d'

• commit '592a04054e6423be5050efd2bceece48b10b9c1d': pixdesc: Replace a few leftover instances of non AV-prefixed flags

Conflicts:

libavutil/pixdesc.c

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

(No files)