Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
3ee53dab
Commit
3ee53dab
authored
Apr 08, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: get rid of ffm-specific stuff in avformat.h
parent
cdc6a87f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
6 deletions
+8
-6
ffmpeg.c
ffmpeg.c
+2
-0
ffserver.c
ffserver.c
+1
-0
avformat.h
libavformat/avformat.h
+0
-6
ffm.h
libavformat/ffm.h
+5
-0
No files found.
ffmpeg.c
View file @
3ee53dab
...
@@ -110,6 +110,8 @@ static const OptionDef options[];
...
@@ -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
];
...
...
ffserver.c
View file @
3ee53dab
...
@@ -29,6 +29,7 @@
...
@@ -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"
...
...
libavformat/avformat.h
View file @
3ee53dab
...
@@ -1508,12 +1508,6 @@ int64_t parse_date(const char *datestr, int duration);
...
@@ -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.
...
...
libavformat/ffm.h
View file @
3ee53dab
...
@@ -28,6 +28,7 @@
...
@@ -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 {
...
@@ -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 */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment