Changeset b8cdf047 in ffmpeg

Timestamp:

Jul 11, 2014, 6:29:40 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

15e933b7

Parents:

6779bf3f (diff), 1173320 (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 '1173320249745eab01c901a39054fc0fced33c87'

• commit '1173320249745eab01c901a39054fc0fced33c87': dsputil: Drop unused bit_depth parameter from all init functions

Conflicts:

libavcodec/dsputil.c
libavcodec/dsputil.h
libavcodec/ppc/dsputil_ppc.c
libavcodec/x86/dsputilenc_mmx.c

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

(No files)