mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '2de7650451d90520135d8cf6f96caa0658824208'
* commit '2de7650451d90520135d8cf6f96caa0658824208': mmal: Move system headers before local headers Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
7c521d4528
|
@ -24,6 +24,12 @@
|
||||||
* MMAL Video Decoder
|
* 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 "avcodec.h"
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "libavutil/atomic.h"
|
#include "libavutil/atomic.h"
|
||||||
|
@ -33,12 +39,6 @@
|
||||||
#include "libavutil/opt.h"
|
#include "libavutil/opt.h"
|
||||||
#include "libavutil/log.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 {
|
typedef struct FFBufferEntry {
|
||||||
AVBufferRef *ref;
|
AVBufferRef *ref;
|
||||||
void *data;
|
void *data;
|
||||||
|
|
Loading…
Reference in New Issue