generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move flv format #defines to common header so they can be used by the encoder too.

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-04-01 13:45:39 +02:00
parent 6408529b5d
commit a0350330cd
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/flv.h
View File

@ -42,6 +42,11 @@
#define AMF_END_OF_OBJECT 0x09 #define AMF_END_OF_OBJECT 0x09
#define KEYFRAMES_TAG "keyframes"
#define KEYFRAMES_TIMESTAMP_TAG "times"
#define KEYFRAMES_BYTEOFFSET_TAG "filepositions"
enum { enum {
FLV_HEADER_FLAG_HASVIDEO = 1, FLV_HEADER_FLAG_HASVIDEO = 1,
FLV_HEADER_FLAG_HASAUDIO = 4, FLV_HEADER_FLAG_HASAUDIO = 4,

4
libavformat/flvdec.c
View File

@ -31,10 +31,6 @@
#include "avio_internal.h" #include "avio_internal.h"
#include "flv.h" #include "flv.h"
#define KEYFRAMES_TAG "keyframes"
#define KEYFRAMES_TIMESTAMP_TAG "times"
#define KEYFRAMES_BYTEOFFSET_TAG "filepositions"
typedef struct { typedef struct {
int wrong_dts; ///< wrong dts due to negative cts int wrong_dts; ///< wrong dts due to negative cts
} FLVContext; } FLVContext;