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
b4330a0e
Commit
b4330a0e
authored
Apr 25, 2017
by
James Almer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/concatdec: fix the h264 annexb extradata check
The start code can be either in the first three or four bytes.
parent
91f8ccdd
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
concatdec.c
libavformat/concatdec.c
+5
-2
No files found.
libavformat/concatdec.c
View file @
b4330a0e
...
@@ -199,8 +199,11 @@ static int detect_stream_specific(AVFormatContext *avf, int idx)
...
@@ -199,8 +199,11 @@ static int detect_stream_specific(AVFormatContext *avf, int idx)
AVBitStreamFilterContext
*
bsf
;
AVBitStreamFilterContext
*
bsf
;
int
ret
;
int
ret
;
if
(
cat
->
auto_convert
&&
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_H264
&&
if
(
cat
->
auto_convert
&&
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_H264
)
{
(
st
->
codecpar
->
extradata_size
<
4
||
AV_RB32
(
st
->
codecpar
->
extradata
)
!=
1
))
{
if
(
!
st
->
codecpar
->
extradata_size
||
(
st
->
codecpar
->
extradata_size
>=
3
&&
AV_RB24
(
st
->
codecpar
->
extradata
)
==
1
)
||
(
st
->
codecpar
->
extradata_size
>=
4
&&
AV_RB32
(
st
->
codecpar
->
extradata
)
==
1
))
return
0
;
av_log
(
cat
->
avf
,
AV_LOG_INFO
,
av_log
(
cat
->
avf
,
AV_LOG_INFO
,
"Auto-inserting h264_mp4toannexb bitstream filter
\n
"
);
"Auto-inserting h264_mp4toannexb bitstream filter
\n
"
);
if
(
!
(
bsf
=
av_bitstream_filter_init
(
"h264_mp4toannexb"
)))
{
if
(
!
(
bsf
=
av_bitstream_filter_init
(
"h264_mp4toannexb"
)))
{
...
...
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