diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-08 11:21:13 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-08 20:58:19 +0200 |
| commit | 3ee53dabcfd8810d01f114599617cf55e481c291 (patch) | |
| tree | 2dd4fd5175c5f84640e7b8c82a957c61053fdd25 | |
| parent | cdc6a87f193b1bf99a640a44374d4f2597118959 (diff) | |
lavf: get rid of ffm-specific stuff in avformat.h
| -rw-r--r-- | ffmpeg.c | 2 | ||||
| -rw-r--r-- | ffserver.c | 1 | ||||
| -rw-r--r-- | libavformat/avformat.h | 6 | ||||
| -rw-r--r-- | libavformat/ffm.h | 5 |
4 files changed, 8 insertions, 6 deletions
@@ -110,6 +110,8 @@ static const OptionDef options[]; #define MAX_STREAMS 1024 /* arbitrary sanity check value */ #endif +#define FFM_PACKET_SIZE 4096 //XXX a duplicate of the line in ffm.h + static const char *last_asked_format = NULL; static AVFormatContext *input_files[MAX_FILES]; static int64_t input_files_ts_offset[MAX_FILES]; diff --git a/ffserver.c b/ffserver.c index eab8ae25ad..36cd9cedbc 100644 --- a/ffserver.c +++ b/ffserver.c @@ -29,6 +29,7 @@ #include <strings.h> #include <stdlib.h> #include "libavformat/avformat.h" +#include "libavformat/ffm.h" #include "libavformat/network.h" #include "libavformat/os_support.h" #include "libavformat/rtpdec.h" diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 8e18a6131d..5c8456f337 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1508,12 +1508,6 @@ int64_t parse_date(const char *datestr, int duration); */ int64_t av_gettime(void); -/* ffm-specific for ffserver */ -#define FFM_PACKET_SIZE 4096 -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); - #if FF_API_FIND_INFO_TAG /** * @deprecated use av_find_info_tag in libavutil instead. diff --git a/libavformat/ffm.h b/libavformat/ffm.h index 4c088d6912..89a14a5a88 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 */ |