summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-14 13:28:19 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-14 13:28:29 +0200
commit7c521d4528927a51449ae8977413cda4d790c6fb (patch)
tree716508c70bf4770b109c5b16359d0dcb279ac53c /libavcodec
parent2051b401cc7e9ec9051c7f575d639944a9869b67 (diff)
parent2de7650451d90520135d8cf6f96caa0658824208 (diff)
Merge commit '2de7650451d90520135d8cf6f96caa0658824208'
* commit '2de7650451d90520135d8cf6f96caa0658824208': mmal: Move system headers before local headers Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mmaldec.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c
index 404e8e051c..ff49b97356 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -24,6 +24,12 @@
* MMAL Video Decoder
*/
+#include <bcm_host.h>
+#include <interface/mmal/mmal.h>
+#include <interface/mmal/util/mmal_util.h>
+#include <interface/mmal/util/mmal_util_params.h>
+#include <interface/mmal/util/mmal_default_components.h>
+
#include "avcodec.h"
#include "internal.h"
#include "libavutil/atomic.h"
@@ -33,12 +39,6 @@
#include "libavutil/opt.h"
#include "libavutil/log.h"
-#include <bcm_host.h>
-#include <interface/mmal/mmal.h>
-#include <interface/mmal/util/mmal_util.h>
-#include <interface/mmal/util/mmal_util_params.h>
-#include <interface/mmal/util/mmal_default_components.h>
-
typedef struct FFBufferEntry {
AVBufferRef *ref;
void *data;