diff options
| author | Calcium <calcium@nurs.or.jp> | 2005-03-23 12:52:24 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2005-03-23 12:52:24 +0000 |
| commit | c64d476ccde1682728e693c750bcc96129defd0c (patch) | |
| tree | 2a7e13bd256927d1ad71c541ce2c0792a3bcd86d /libavformat | |
| parent | 649b918c9f0ad4699ae756a9deace5806c6d683c (diff) | |
| download | ffmpeg-c64d476ccde1682728e693c750bcc96129defd0c.tar.gz | |
30_clean_up_global_header_flag.patch by (Calcium | calcium nurs or jp)
Originally committed as revision 4072 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 3 | ||||
| -rw-r--r-- | libavformat/movenc.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 6fe15b5b17..7beef99999 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -124,6 +124,7 @@ typedef struct AVFormatParameters { #define AVFMT_SHOW_IDS 0x0008 /* show format stream IDs numbers */ #define AVFMT_RAWPICTURE 0x0020 /* format wants AVPicture structure for raw picture data */ +#define AVFMT_GLOBALHEADER 0x0040 /* format wants global header */ typedef struct AVOutputFormat { const char *name; @@ -138,7 +139,7 @@ typedef struct AVOutputFormat { int (*write_header)(struct AVFormatContext *); int (*write_packet)(struct AVFormatContext *, AVPacket *pkt); int (*write_trailer)(struct AVFormatContext *); - /* can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER */ + /* can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER, AVFMT_GLOBALHEADER */ int flags; /* currently only used to set pixel format if not YUV420P */ int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *); diff --git a/libavformat/movenc.c b/libavformat/movenc.c index ed9700fcdd..e7b66cdee2 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1497,6 +1497,7 @@ static AVOutputFormat mov_oformat = { mov_write_header, mov_write_packet, mov_write_trailer, + .flags = AVFMT_GLOBALHEADER, }; static AVOutputFormat _3gp_oformat = { @@ -1510,6 +1511,7 @@ static AVOutputFormat _3gp_oformat = { mov_write_header, mov_write_packet, mov_write_trailer, + .flags = AVFMT_GLOBALHEADER, }; static AVOutputFormat mp4_oformat = { @@ -1523,6 +1525,7 @@ static AVOutputFormat mp4_oformat = { mov_write_header, mov_write_packet, mov_write_trailer, + .flags = AVFMT_GLOBALHEADER, }; static AVOutputFormat psp_oformat = { @@ -1536,6 +1539,7 @@ static AVOutputFormat psp_oformat = { mov_write_header, mov_write_packet, mov_write_trailer, + .flags = AVFMT_GLOBALHEADER, }; static AVOutputFormat _3g2_oformat = { @@ -1549,6 +1553,7 @@ static AVOutputFormat _3g2_oformat = { mov_write_header, mov_write_packet, mov_write_trailer, + .flags = AVFMT_GLOBALHEADER, }; int movenc_init(void) |