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
14f79ba1
Commit
14f79ba1
authored
Dec 18, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: remove redundant parts of old slice in extradata code.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
99321d1b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
11 deletions
+1
-11
h264.c
libavcodec/h264.c
+1
-10
h264.h
libavcodec/h264.h
+0
-1
No files found.
libavcodec/h264.c
View file @
14f79ba1
...
...
@@ -1001,7 +1001,7 @@ static av_cold void common_init(H264Context *h)
memset
(
h
->
pps
.
scaling_matrix8
,
16
,
2
*
64
*
sizeof
(
uint8_t
));
}
static
int
ff_h264_decode_extradata_internal
(
H264Context
*
h
,
const
uint8_t
*
buf
,
int
size
)
int
ff_h264_decode_extradata
(
H264Context
*
h
,
const
uint8_t
*
buf
,
int
size
)
{
AVCodecContext
*
avctx
=
h
->
s
.
avctx
;
...
...
@@ -1058,15 +1058,6 @@ static int ff_h264_decode_extradata_internal(H264Context *h, const uint8_t *buf,
return
size
;
}
int
ff_h264_decode_extradata
(
H264Context
*
h
,
const
uint8_t
*
buf
,
int
size
)
{
int
ret
;
h
->
decoding_extradata
=
1
;
ret
=
ff_h264_decode_extradata_internal
(
h
,
buf
,
size
);
h
->
decoding_extradata
=
0
;
return
ret
;
}
av_cold
int
ff_h264_decode_init
(
AVCodecContext
*
avctx
)
{
H264Context
*
h
=
avctx
->
priv_data
;
...
...
libavcodec/h264.h
View file @
14f79ba1
...
...
@@ -444,7 +444,6 @@ typedef struct H264Context {
int
nal_unit_type
;
uint8_t
*
rbsp_buffer
[
2
];
unsigned
int
rbsp_buffer_size
[
2
];
int
decoding_extradata
;
/**
* Used to parse AVC variant of h264
...
...
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