Merge commit '1746dc382ddbf3f8a3f039815644f7eb9076110e'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 21:13:12 +0000 (23:13 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 21:13:16 +0000 (23:13 +0200)
* commit '1746dc382ddbf3f8a3f039815644f7eb9076110e':
  hqxdsp.h: #include "stddef.h"

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hqxdsp.h

Simple merge