From: Michael Niedermayer Date: Tue, 25 Nov 2014 03:12:22 +0000 (+0100) Subject: Merge remote-tracking branch 'cehoyos/master' X-Git-Tag: n2.5~183 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=67dbf8bec977571120f2c70c60ea637fa8916dd6;hp=-c Merge remote-tracking branch 'cehoyos/master' * cehoyos/master: Include config.h from huffyuvdsp.h. Include stddef from snow_dwt.h. Merged-by: Michael Niedermayer --- 67dbf8bec977571120f2c70c60ea637fa8916dd6