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/adx_parser.c | |
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/adx_parser.c')
0 files changed, 0 insertions, 0 deletions