Changeset 5866c107 in ffmpeg

Timestamp:

Sep 6, 2013, 10:21:16 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

61845dc7

Parents:

92424a4 (diff), c3e6e8f0 (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 'c3e6e8f06c42499bd020fd0b37f9542150e6067b'

• commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b': mem: Do not check unsigned values for negative size

Conflicts:

libavutil/mem.c

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

(No files)