1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00

Merge commit '2de7650451d90520135d8cf6f96caa0658824208'

* commit '2de7650451d90520135d8cf6f96caa0658824208':
  mmal: Move system headers before local headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-04-14 13:28:19 +02:00
commit 7c521d4528

View File

@ -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;