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
9db5f820
Commit
9db5f820
authored
Dec 30, 2012
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffserver: add missing padding to extradata.
parent
36e61e24
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
ffserver.c
ffserver.c
+2
-2
No files found.
ffserver.c
View file @
9db5f820
...
@@ -3518,7 +3518,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop
...
@@ -3518,7 +3518,7 @@ static AVStream *add_av_stream1(FFStream *stream, AVCodecContext *codec, int cop
fst
->
codec
=
avcodec_alloc_context3
(
NULL
);
fst
->
codec
=
avcodec_alloc_context3
(
NULL
);
memcpy
(
fst
->
codec
,
codec
,
sizeof
(
AVCodecContext
));
memcpy
(
fst
->
codec
,
codec
,
sizeof
(
AVCodecContext
));
if
(
codec
->
extradata_size
)
{
if
(
codec
->
extradata_size
)
{
fst
->
codec
->
extradata
=
av_malloc
(
codec
->
extradata_size
);
fst
->
codec
->
extradata
=
av_malloc
z
(
codec
->
extradata_size
+
FF_INPUT_BUFFER_PADDING_SIZE
);
memcpy
(
fst
->
codec
->
extradata
,
codec
->
extradata
,
memcpy
(
fst
->
codec
->
extradata
,
codec
->
extradata
,
codec
->
extradata_size
);
codec
->
extradata_size
);
}
}
...
@@ -3627,7 +3627,7 @@ static void extract_mpeg4_header(AVFormatContext *infile)
...
@@ -3627,7 +3627,7 @@ static void extract_mpeg4_header(AVFormatContext *infile)
p
[
2
]
==
0x01
&&
p
[
3
]
==
0xb6
)
{
p
[
2
]
==
0x01
&&
p
[
3
]
==
0xb6
)
{
size
=
p
-
pkt
.
data
;
size
=
p
-
pkt
.
data
;
// av_hex_dump_log(infile, AV_LOG_DEBUG, pkt.data, size);
// av_hex_dump_log(infile, AV_LOG_DEBUG, pkt.data, size);
st
->
codec
->
extradata
=
av_malloc
(
size
);
st
->
codec
->
extradata
=
av_malloc
z
(
size
+
FF_INPUT_BUFFER_PADDING_SIZE
);
st
->
codec
->
extradata_size
=
size
;
st
->
codec
->
extradata_size
=
size
;
memcpy
(
st
->
codec
->
extradata
,
pkt
.
data
,
size
);
memcpy
(
st
->
codec
->
extradata
,
pkt
.
data
,
size
);
break
;
break
;
...
...
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