mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
remove implicit header inclusions from mxf.h
Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
84a2d3045b
commit
251bf87560
@ -41,6 +41,7 @@ const MXFCodecUL ff_mxf_codec_uls[] = {
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x02,0x01,0x02,0x00 }, 13, CODEC_ID_DVVIDEO }, /* DV25 IEC PAL */
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x07,0x04,0x01,0x02,0x02,0x03,0x01,0x01,0x00 }, 14, CODEC_ID_JPEG2000 }, /* JPEG2000 Codestream */
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_RAWVIDEO }, /* Uncompressed */
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x01,0x02,0x02,0x03,0x02,0x00,0x00 }, 14, CODEC_ID_DNXHD }, /* SMPTE VC-3/DNxHD */
|
||||
/* SoundEssenceCompression */
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x00,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16LE }, /* Uncompressed */
|
||||
{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x01,0x7F,0x00,0x00,0x00 }, 13, CODEC_ID_PCM_S16LE },
|
||||
|
@ -21,9 +21,8 @@
|
||||
#ifndef AVFORMAT_MXF_H
|
||||
#define AVFORMAT_MXF_H
|
||||
|
||||
#include <string.h>
|
||||
#include "avformat.h"
|
||||
#include "libavcodec/bytestream.h"
|
||||
#include "libavcodec/avcodec.h"
|
||||
#include <stdint.h>
|
||||
|
||||
typedef uint8_t UID[16];
|
||||
|
||||
|
@ -46,6 +46,8 @@
|
||||
//#define DEBUG
|
||||
|
||||
#include "libavutil/aes.h"
|
||||
#include "libavcodec/bytestream.h"
|
||||
#include "avformat.h"
|
||||
#include "mxf.h"
|
||||
|
||||
typedef struct {
|
||||
|
@ -36,7 +36,9 @@
|
||||
#include <time.h>
|
||||
|
||||
#include "libavutil/fifo.h"
|
||||
#include "libavcodec/bytestream.h"
|
||||
#include "audiointerleave.h"
|
||||
#include "avformat.h"
|
||||
#include "mxf.h"
|
||||
|
||||
static const int NTSC_samples_per_frame[] = { 1602, 1601, 1602, 1601, 1602, 0 };
|
||||
|
Loading…
Reference in New Issue
Block a user