diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 13:45:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-01 17:38:29 +0200 |
| commit | a0350330cdbbb39544e64f4909d86a969b4664dd (patch) | |
| tree | 5320d5848ff2a3e69804c3099e7b06f7c774c09e | |
| parent | 6408529b5d5e8564312ed1b70c0db5a9bc8ea9d5 (diff) | |
| download | ffmpeg-a0350330cdbbb39544e64f4909d86a969b4664dd.tar.gz | |
Move flv format #defines to common header so they can be used by the encoder too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/flv.h | 5 | ||||
| -rw-r--r-- | libavformat/flvdec.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/flv.h b/libavformat/flv.h index 5d2666d28c..497729adc6 100644 --- a/libavformat/flv.h +++ b/libavformat/flv.h @@ -42,6 +42,11 @@ #define AMF_END_OF_OBJECT 0x09 +#define KEYFRAMES_TAG "keyframes" +#define KEYFRAMES_TIMESTAMP_TAG "times" +#define KEYFRAMES_BYTEOFFSET_TAG "filepositions" + + enum { FLV_HEADER_FLAG_HASVIDEO = 1, FLV_HEADER_FLAG_HASAUDIO = 4, diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 3f507c3bbb..cbc44618f3 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -31,10 +31,6 @@ #include "avio_internal.h" #include "flv.h" -#define KEYFRAMES_TAG "keyframes" -#define KEYFRAMES_TIMESTAMP_TAG "times" -#define KEYFRAMES_BYTEOFFSET_TAG "filepositions" - typedef struct { int wrong_dts; ///< wrong dts due to negative cts } FLVContext; |