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)
* commit 'e25cac50e05d29a15d7a52c01c394ba913c97aee':
  lavc: Add missing mem.h header to libxvid and screenpresso

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

Simple merge
Simple merge