Merge commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 10:21:16 +0000 (12:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 10:21:16 +0000 (12:21 +0200)
commit5866c107a9b9d936f3b5c2385a5f724c900df01d
tree7bebe4966b3bd7d33d9f0201963633c7e242f622
parent92424a45d0c3154ad83aaba6e0fb8dbb17d8d1a4
parentc3e6e8f06c42499bd020fd0b37f9542150e6067b
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>
libavutil/mem.c