diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-19 14:08:42 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2015-11-19 14:08:42 +0000 |
| commit | 8f63355f8f387b3db67b18004ef9a5befc99e8cb (patch) | |
| tree | 759c069f3fa1ec1cd8986b5c68d0185937409b68 /libavcodec | |
| parent | c63847528219e8e14735ac4778d53242f58afb21 (diff) | |
| parent | e25cac50e05d29a15d7a52c01c394ba913c97aee (diff) | |
| download | ffmpeg-8f63355f8f387b3db67b18004ef9a5befc99e8cb.tar.gz | |
Merge commit 'e25cac50e05d29a15d7a52c01c394ba913c97aee'
* commit 'e25cac50e05d29a15d7a52c01c394ba913c97aee':
lavc: Add missing mem.h header to libxvid and screenpresso
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libxvid.c | 1 | ||||
| -rw-r--r-- | libavcodec/screenpresso.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index b3cf57fe84..94fd053f3c 100644 --- a/libavcodec/libxvid.c +++ b/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" diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c index b64e710a60..2c4bb19b20 100644 --- a/libavcodec/screenpresso.c +++ b/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" |