Changeset 0a28a52d in ffmpeg

Timestamp:

Jul 21, 2013, 9:59:16 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

db0384c9

Parents:

75fbe41f (diff), dd0bfc3 (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> (07/21/13 09:55:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/21/13 09:59:16)

Message:

Merge commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93'

• commit 'dd0bfc3a6a310e3e3674ce7742672d689a9a0e93': dsicinav: Bound-check the source buffer when needed

Conflicts:

libavcodec/dsicinav.c

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

(No files)