RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavf: get rid of ffm-specific stuff in avformat.h

This commit is contained in:
Anton Khirnov 2011-04-08 11:21:13 +02:00
parent cdc6a87f19
commit 3ee53dabcf
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg.c
View File

@ -110,6 +110,8 @@ static const OptionDef options[];
#define MAX_STREAMS 1024 /* arbitrary sanity check value */ #define MAX_STREAMS 1024 /* arbitrary sanity check value */
#endif #endif
#define FFM_PACKET_SIZE 4096 //XXX a duplicate of the line in ffm.h
static const char *last_asked_format = NULL; static const char *last_asked_format = NULL;
static AVFormatContext *input_files[MAX_FILES]; static AVFormatContext *input_files[MAX_FILES];
static int64_t input_files_ts_offset[MAX_FILES]; static int64_t input_files_ts_offset[MAX_FILES];

1
ffserver.c
View File

@ -29,6 +29,7 @@
#include <strings.h> #include <strings.h>
#include <stdlib.h> #include <stdlib.h>
#include "libavformat/avformat.h" #include "libavformat/avformat.h"
#include "libavformat/ffm.h"
#include "libavformat/network.h" #include "libavformat/network.h"
#include "libavformat/os_support.h" #include "libavformat/os_support.h"
#include "libavformat/rtpdec.h" #include "libavformat/rtpdec.h"

6
libavformat/avformat.h
View File

@ -1508,12 +1508,6 @@ int64_t parse_date(const char *datestr, int duration);
*/ */
int64_t av_gettime(void); 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 #if FF_API_FIND_INFO_TAG
/** /**
* @deprecated use av_find_info_tag in libavutil instead. * @deprecated use av_find_info_tag in libavutil instead.

5
libavformat/ffm.h
View File

@ -28,6 +28,7 @@
/* The FFM file is made of blocks of fixed size */ /* The FFM file is made of blocks of fixed size */
#define FFM_HEADER_SIZE 14 #define FFM_HEADER_SIZE 14
#define FFM_PACKET_SIZE 4096
#define PACKET_ID 0x666d #define PACKET_ID 0x666d
/* each packet contains frames (which can span several packets */ /* each packet contains frames (which can span several packets */
@ -55,4 +56,8 @@ typedef struct FFMContext {
uint8_t packet[FFM_PACKET_SIZE]; uint8_t packet[FFM_PACKET_SIZE];
} FFMContext; } 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 */ #endif /* AVFORMAT_FFM_H */