diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:09:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-09 03:17:07 +0200 |
| commit | d4d09329eef30787da699c7a397b00f6f96940bc (patch) | |
| tree | 3605d4e30063b924254a373e270026bca6436f11 /libavformat/ffm.h | |
| parent | a61bc91d42945e6ccefef4867ef32d2073f8f8c7 (diff) | |
| parent | 0c68c804196400de3c40c8849124b292ed62b99c (diff) | |
Merge remote branch 'qatar/master'
* qatar/master:
lavf: bump minor and add an APIChanges entry for avformat cleanup
lavf: get rid of ffm-specific stuff in avformat.h
Not pulled: avio: deprecate av_protocol_next().
avio: add a function for iterating though protocol names.
lavf: rename a parameter of av_sdp_create from buff->buf
lavf: rename avf_sdp_create to av_sdp_create.
lavf: make av_guess_image2_codec internal
avio: make URLProtocol internal.
avio: make URLContext internal.
lavf: mark av_pkt_dump(_log) for remove on $next+1 bump.
lavf: use designated initializers for all protocols
applehttp: don't use deprecated url_ functions.
avio: move two ff_udp_* functions from avio_internal to url.h
asfdec: remove a forgotten declaration of nonexistent function
avio: deprecate the typedef for URLInterruptCB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ffm.h')
| -rw-r--r-- | libavformat/ffm.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/ffm.h b/libavformat/ffm.h index 05d6eb1053..04f19cc88e 100644 --- a/libavformat/ffm.h +++ b/libavformat/ffm.h @@ -28,6 +28,7 @@ /* The FFM file is made of blocks of fixed size */ #define FFM_HEADER_SIZE 14 +#define FFM_PACKET_SIZE 4096 #define PACKET_ID 0x666d /* each packet contains frames (which can span several packets */ @@ -55,4 +56,8 @@ typedef struct FFMContext { uint8_t packet[FFM_PACKET_SIZE]; } FFMContext; +int64_t ffm_read_write_index(int fd); +int ffm_write_write_index(int fd, int64_t pos); +void ffm_set_write_index(AVFormatContext *s, int64_t pos, int64_t file_size); + #endif /* AVFORMAT_FFM_H */ |