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
ee0dadc1
Commit
ee0dadc1
authored
Sep 01, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
flvdec: always set AVFMTCTX_NOHEADER.
New streams may be created at any time, e.g. on codec change.
parent
0697d812
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
4 deletions
+1
-4
flvdec.c
libavformat/flvdec.c
+1
-4
No files found.
libavformat/flvdec.c
View file @
ee0dadc1
...
...
@@ -501,9 +501,7 @@ static int flv_read_header(AVFormatContext *s)
av_log
(
s
,
AV_LOG_WARNING
,
"Broken FLV file, which says no streams present, this might fail
\n
"
);
}
if
((
flags
&
(
FLV_HEADER_FLAG_HASVIDEO
|
FLV_HEADER_FLAG_HASAUDIO
))
!=
(
FLV_HEADER_FLAG_HASVIDEO
|
FLV_HEADER_FLAG_HASAUDIO
))
s
->
ctx_flags
|=
AVFMTCTX_NOHEADER
;
s
->
ctx_flags
|=
AVFMTCTX_NOHEADER
;
if
(
flags
&
FLV_HEADER_FLAG_HASVIDEO
){
if
(
!
create_stream
(
s
,
AVMEDIA_TYPE_VIDEO
))
...
...
@@ -714,7 +712,6 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if
(
i
==
s
->
nb_streams
){
st
=
create_stream
(
s
,
is_audio
?
AVMEDIA_TYPE_AUDIO
:
AVMEDIA_TYPE_VIDEO
);
s
->
ctx_flags
&=
~
AVFMTCTX_NOHEADER
;
}
av_dlog
(
s
,
"%d %X %d
\n
"
,
is_audio
,
flags
,
st
->
discard
);
if
(
(
st
->
discard
>=
AVDISCARD_NONKEY
&&
!
((
flags
&
FLV_VIDEO_FRAMETYPE_MASK
)
==
FLV_FRAME_KEY
||
is_audio
))
...
...
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