Merge commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48'

* commit '439929859ae0eb9542d3bb8a0c856bd5a1d1ec48':
  testprogs: Clean up #includes

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libavdevice/timefilter.c

@@ -24,7 +24,7 @@
 
 #include "libavutil/common.h"
 #include "libavutil/mem.h"
-#include "config.h"
+
 #include "timefilter.h"
 
 struct TimeFilter {

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" \

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

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"

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"