Changeset c738ffcf in ffmpeg

Timestamp:

Mar 17, 2014, 2:43:55 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ba7cdb97

Parents:

3731c409 (diff), 58c21596 (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 14:43:21)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/17/14 14:43:55)

Message:

Merge commit '58c215961a9067bb670387bbd72286c30de04b93'

• commit '58c215961a9067bb670387bbd72286c30de04b93': raw, nut: Support rgba64 encoding

Conflicts:

libavcodec/raw.c
libavformat/nut.c

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

(No files)