Changeset 48a6916 in ffmpeg

Timestamp:

May 27, 2014, 10:03:59 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5313d60

Parents:

e2abc0d5 (diff), 512f3ffe (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 '512f3ffe9b4bb86767c2b1176554407c75fe1a5c'

• commit '512f3ffe9b4bb86767c2b1176554407c75fe1a5c': dsputil: Split off HuffYUV encoding bits into their own context

Conflicts:

configure
libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/huffyuv.h
libavcodec/huffyuvenc.c
libavcodec/pngenc.c
libavcodec/x86/dsputilenc_mmx.c

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

(No files)