Changeset ec8a3e25 in ffmpeg

Timestamp:

Dec 7, 2011, 11:37:55 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6778f9d9

Parents:

8e2bab5 (diff), c5cd2311 (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 remote-tracking branch 'shariman/wmall'

• shariman/wmall: Partially fix CDLMS prediction

Conflicts:

libavcodec/wmalosslessdec.c

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

(No files)