[FFmpeg-cvslog] avformat/flvenc: add FLVFlags for flvflags options

Steven Liu git at videolan.org
Wed Sep 14 02:58:22 EEST 2016


ffmpeg | branch: master | Steven Liu <lingjiujianke at gmail.com> | Tue Sep 13 21:59:56 2016 +0800| [84aebfc74ee35bb9cdd3a3bf64b7c54ae867a916] | committer: Michael Niedermayer

avformat/flvenc: add FLVFlags for flvflags options

add FLVFlags type, be used to add new FLVFlags options

Signed-off-by: Steven Liu <lingjiujianke at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/flvenc.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index ccbcf64..a3623f8 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -61,6 +61,10 @@ static const AVCodecTag flv_audio_codec_ids[] = {
     { AV_CODEC_ID_NONE,       0 }
 };
 
+typedef enum {
+    FLV_AAC_SEQ_HEADER_DETECT = (1 << 0),
+} FLVFlags;
+
 typedef struct FLVContext {
     AVClass *av_class;
     int     reserved;
@@ -364,7 +368,7 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par) {
             avio_w8(pb, get_audio_flags(s, par));
             avio_w8(pb, 0); // AAC sequence header
 
-            if (!par->extradata_size && flv->flags & 1) {
+            if (!par->extradata_size && flv->flags & FLV_AAC_SEQ_HEADER_DETECT) {
                 PutBitContext pbc;
                 int samplerate_index;
                 int channels = flv->audio_par->channels
@@ -718,7 +722,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
 
 static const AVOption options[] = {
     { "flvflags", "FLV muxer flags", offsetof(FLVContext, flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" },
-    { "aac_seq_header_detect", "Put AAC sequence header based on stream data", 0, AV_OPT_TYPE_CONST, {.i64 = 1}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" },
+    { "aac_seq_header_detect", "Put AAC sequence header based on stream data", 0, AV_OPT_TYPE_CONST, {.i64 = FLV_AAC_SEQ_HEADER_DETECT}, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM, "flvflags" },
     { NULL },
 };
 



More information about the ffmpeg-cvslog mailing list