Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
42ae83c1
Commit
42ae83c1
authored
Feb 05, 2012
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow muxing VP6A into flv.
Reviewed-by: James Zern
parent
8162c6f0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
flvenc.c
libavformat/flvenc.c
+3
-2
No files found.
libavformat/flvenc.c
View file @
42ae83c1
...
...
@@ -39,6 +39,7 @@ static const AVCodecTag flv_video_codec_ids[] = {
{
CODEC_ID_FLASHSV2
,
FLV_CODECID_SCREEN2
},
{
CODEC_ID_VP6F
,
FLV_CODECID_VP6
},
{
CODEC_ID_VP6
,
FLV_CODECID_VP6
},
{
CODEC_ID_VP6A
,
FLV_CODECID_VP6A
},
{
CODEC_ID_H264
,
FLV_CODECID_H264
},
{
CODEC_ID_NONE
,
0
}
};
...
...
@@ -407,7 +408,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
// av_log(s, AV_LOG_DEBUG, "type:%d pts: %"PRId64" size:%d\n", enc->codec_type, timestamp, size);
if
(
enc
->
codec_id
==
CODEC_ID_VP6
||
enc
->
codec_id
==
CODEC_ID_VP6F
||
enc
->
codec_id
==
CODEC_ID_AAC
)
enc
->
codec_id
==
CODEC_ID_
VP6A
||
enc
->
codec_id
==
CODEC_ID_
AAC
)
flags_size
=
2
;
else
if
(
enc
->
codec_id
==
CODEC_ID_H264
||
enc
->
codec_id
==
CODEC_ID_MPEG4
)
flags_size
=
5
;
...
...
@@ -479,7 +480,7 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
if
(
enc
->
codec_id
==
CODEC_ID_VP6
)
avio_w8
(
pb
,
0
);
if
(
enc
->
codec_id
==
CODEC_ID_VP6F
)
if
(
enc
->
codec_id
==
CODEC_ID_VP6F
||
enc
->
codec_id
==
CODEC_ID_VP6A
)
avio_w8
(
pb
,
enc
->
extradata_size
?
enc
->
extradata
[
0
]
:
0
);
else
if
(
enc
->
codec_id
==
CODEC_ID_AAC
)
avio_w8
(
pb
,
1
);
// AAC raw
...
...
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