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
27b0e6eb
Commit
27b0e6eb
authored
Mar 31, 2015
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: drop needs_realloc
It is not needed anymore since switching to refcounted frames.
parent
0ac8ff61
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
12 deletions
+0
-12
h264.c
libavcodec/h264.c
+0
-3
h264.h
libavcodec/h264.h
+0
-1
h264_picture.c
libavcodec/h264_picture.c
+0
-1
h264_slice.c
libavcodec/h264_slice.c
+0
-7
No files found.
libavcodec/h264.c
View file @
27b0e6eb
...
...
@@ -359,9 +359,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp)
for
(
i
=
0
;
i
<
H264_MAX_PICTURE_COUNT
;
i
++
)
ff_h264_unref_picture
(
h
,
&
h
->
DPB
[
i
]);
av_freep
(
&
h
->
DPB
);
}
else
if
(
h
->
DPB
)
{
for
(
i
=
0
;
i
<
H264_MAX_PICTURE_COUNT
;
i
++
)
h
->
DPB
[
i
].
needs_realloc
=
1
;
}
h
->
cur_pic_ptr
=
NULL
;
...
...
libavcodec/h264.h
View file @
27b0e6eb
...
...
@@ -292,7 +292,6 @@ typedef struct H264Picture {
int
mbaff
;
///< 1 -> MBAFF frame 0-> not MBAFF
int
field_picture
;
///< whether or not picture was encoded in separate fields
int
needs_realloc
;
///< picture needs to be reallocated (eg due to a frame size change)
int
reference
;
int
recovered
;
///< picture at IDR or recovery point + recovery count
}
H264Picture
;
...
...
libavcodec/h264_picture.c
View file @
27b0e6eb
...
...
@@ -113,7 +113,6 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src)
dst
->
long_ref
=
src
->
long_ref
;
dst
->
mbaff
=
src
->
mbaff
;
dst
->
field_picture
=
src
->
field_picture
;
dst
->
needs_realloc
=
src
->
needs_realloc
;
dst
->
reference
=
src
->
reference
;
dst
->
recovered
=
src
->
recovered
;
...
...
libavcodec/h264_slice.c
View file @
27b0e6eb
...
...
@@ -273,8 +273,6 @@ static inline int pic_is_unused(H264Context *h, H264Picture *pic)
{
if
(
!
pic
->
f
.
buf
[
0
])
return
1
;
if
(
pic
->
needs_realloc
&&
!
(
pic
->
reference
&
DELAYED_PIC_REF
))
return
1
;
return
0
;
}
...
...
@@ -289,11 +287,6 @@ static int find_unused_picture(H264Context *h)
if
(
i
==
H264_MAX_PICTURE_COUNT
)
return
AVERROR_INVALIDDATA
;
if
(
h
->
DPB
[
i
].
needs_realloc
)
{
h
->
DPB
[
i
].
needs_realloc
=
0
;
ff_h264_unref_picture
(
h
,
&
h
->
DPB
[
i
]);
}
return
i
;
}
...
...
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