Changeset 12ab07be in ffmpeg

Timestamp:

Mar 27, 2014, 12:10:28 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

62094e2f

Parents:

61b5ef77 (diff), e50f5d3c (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.

Message:

Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'

• commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b': Alias PIX image encoder and decoder

Conflicts:

Changelog
libavcodec/allcodecs.c
libavcodec/version.h
libavformat/img2enc.c

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

(No files)