Changeset 9ad477d9 in ffmpeg

Timestamp:

Nov 17, 2013, 2:17:48 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

92cbd775

Parents:

8d193a24 (diff), e4155f15 (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> (11/17/13 02:17:00)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/17/13 02:17:48)

Message:

Merge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462'

• commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462': eamad: use the AVFrame API properly. dpxenc: use the AVFrame API properly. bmpenc: use the AVFrame API properly. sgienc: use the AVFrame API properly.

Conflicts:

libavcodec/bmpenc.c
libavcodec/dpxenc.c
libavcodec/eamad.c
libavcodec/sgienc.c

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

(No files)