Merge commit 'e25cac50'

* commit 'e25cac50':
  lavc: Add missing mem.h header to libxvid and screenpresso
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libavcodec/libxvid.c

@@ -35,6 +35,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/mathematics.h"
+#include "libavutil/mem.h"
 #include "libavutil/opt.h"
 
 #include "avcodec.h"

libavcodec/screenpresso.c

@@ -39,6 +39,7 @@
 
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
+#include "libavutil/mem.h"
 
 #include "avcodec.h"
 #include "internal.h"