Changeset 9b424acc in ffmpeg

Timestamp:

Nov 13, 2014, 12:59:53 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2c4d5d34

Parents:

e266e186 (diff), 2ffb0598 (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> (11/13/14 12:59:22)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/13/14 12:59:53)

Message:

Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'

• commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834': mlpdec: check for negative index

Conflicts:

libavcodec/mlpdec.c

See: 8491ac3ad2e9fc92479d6fc42d6ee4cb8d6f61d3

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

(No files)