[FFmpeg-cvslog] Move flv format #defines to common header so they can be used by the encoder too .

Michael Niedermayer git at videolan.org
Fri Apr 1 17:40:58 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr  1 13:45:39 2011 +0200| [a0350330cdbbb39544e64f4909d86a969b4664dd] | committer: Michael Niedermayer

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

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0350330cdbbb39544e64f4909d86a969b4664dd
---

 libavformat/flv.h    |    5 +++++
 libavformat/flvdec.c |    4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libavformat/flv.h b/libavformat/flv.h
index 5d2666d..497729a 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 3f507c3..cbc4461 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;



More information about the ffmpeg-cvslog mailing list