Merge commit 'e25cac50e05d29a15d7a52c01c394ba913c97aee'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 19 Nov 2015 14:08:42 +0000 (14:08 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Thu, 19 Nov 2015 14:08:42 +0000 (14:08 +0000)
commit8f63355f8f387b3db67b18004ef9a5befc99e8cb
tree759c069f3fa1ec1cd8986b5c68d0185937409b68
parentc63847528219e8e14735ac4778d53242f58afb21
parente25cac50e05d29a15d7a52c01c394ba913c97aee
Merge commit 'e25cac50e05d29a15d7a52c01c394ba913c97aee'

* commit 'e25cac50e05d29a15d7a52c01c394ba913c97aee':
  lavc: Add missing mem.h header to libxvid and screenpresso

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
libavcodec/libxvid.c
libavcodec/screenpresso.c