summaryrefslogtreecommitdiff
path: root/libavutil
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-21 16:04:10 +0100
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2016-04-21 16:04:17 +0100
commit32c044cbc64034a9688e3711efe5251998d767b1 (patch)
tree4defbcc23e8e1e2f698187519cc5b493023a1cda /libavutil
parent53107052b2a12a8ab037c77e1064c085fd0826f2 (diff)
parent439929859ae0eb9542d3bb8a0c856bd5a1d1ec48 (diff)
Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'
* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48': testprogs: Clean up #includes Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil')
-rw-r--r--libavutil/des.c4
-rw-r--r--libavutil/lls.c1
2 files changed, 3 insertions, 2 deletions
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"