Changeset 119cf2a4 in ffmpeg

Timestamp:

Apr 2, 2014, 12:44:00 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

45ba9d85

Parents:

e03f0933 (diff), 80035db8 (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> (04/02/14 00:43:19)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/02/14 00:44:00)

Message:

Merge commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e'

• commit '80035db88c1f7cc23110c7472a2b13a4d2d8b73e': lavu: add missing formats to av_pix_fmt_swap_endianness

Conflicts:

libavutil/pixdesc.c

No change as our av_pix_fmt_swap_endianness() does not need formats to be listed individually

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

(No files)