diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:04:10 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-21 16:04:17 +0100 |
| commit | 32c044cbc64034a9688e3711efe5251998d767b1 (patch) | |
| tree | 4defbcc23e8e1e2f698187519cc5b493023a1cda | |
| parent | 53107052b2a12a8ab037c77e1064c085fd0826f2 (diff) | |
| parent | 439929859ae0eb9542d3bb8a0c856bd5a1d1ec48 (diff) | |
Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'
* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48':
testprogs: Clean up #includes
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| -rw-r--r-- | libavdevice/timefilter.c | 2 | ||||
| -rw-r--r-- | libavformat/rtmpdh.c | 10 | ||||
| -rw-r--r-- | libavformat/rtmpdh.h | 3 | ||||
| -rw-r--r-- | libavutil/des.c | 4 | ||||
| -rw-r--r-- | libavutil/lls.c | 1 |
5 files changed, 15 insertions, 5 deletions
diff --git a/libavdevice/timefilter.c b/libavdevice/timefilter.c index 9d38f93b96..a4ae204139 100644 --- a/libavdevice/timefilter.c +++ b/libavdevice/timefilter.c @@ -24,7 +24,7 @@ #include "libavutil/common.h" #include "libavutil/mem.h" -#include "config.h" + #include "timefilter.h" struct TimeFilter { diff --git a/libavformat/rtmpdh.c b/libavformat/rtmpdh.c index 42ad72c6bb..c52af9aa13 100644 --- a/libavformat/rtmpdh.c +++ b/libavformat/rtmpdh.c @@ -26,10 +26,18 @@ * RTMP Diffie-Hellmann utilities */ +#include <stdint.h> +#include <string.h> + #include "config.h" -#include "rtmpdh.h" + +#include "libavutil/attributes.h" +#include "libavutil/error.h" +#include "libavutil/mem.h" #include "libavutil/random_seed.h" +#include "rtmpdh.h" + #define P1024 \ "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" \ "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" \ diff --git a/libavformat/rtmpdh.h b/libavformat/rtmpdh.h index 95b2620248..2b250f595d 100644 --- a/libavformat/rtmpdh.h +++ b/libavformat/rtmpdh.h @@ -22,7 +22,8 @@ #ifndef AVFORMAT_RTMPDH_H #define AVFORMAT_RTMPDH_H -#include "avformat.h" +#include <stdint.h> + #include "config.h" #if CONFIG_GMP || CONFIG_GCRYPT diff --git a/libavutil/des.c b/libavutil/des.c index 7198076c32..ec2c399590 100644 --- a/libavutil/des.c +++ b/libavutil/des.c @@ -18,7 +18,9 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <inttypes.h> + +#include <stdint.h> + #include "avutil.h" #include "common.h" #include "intreadwrite.h" diff --git a/libavutil/lls.c b/libavutil/lls.c index 7dd718da86..de3d58f6d9 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -29,7 +29,6 @@ #include <string.h> #include "attributes.h" -#include "config.h" #include "internal.h" #include "version.h" #include "lls.h" |