Changeset 865f3482 in ffmpeg

Timestamp:

Jul 24, 2013, 8:15:50 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

a550926

Parents:

6bab3430 (diff), 70ecc175 (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 '70ecc175c7b513a153ac87d1c5d219556ca55070'

• commit '70ecc175c7b513a153ac87d1c5d219556ca55070': alsdec: Fix the clipping range

Conflicts:

libavcodec/alsdec.c

See: feaff427c0df015146f660199453bd8c0314e677

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

(No files)