Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
sixue.cheng
FFmpeg
Commits
cff1c0ed
Commit
cff1c0ed
authored
8 years ago
by
Michael Niedermayer
Browse files
Options
Download
Email Patches
Plain Diff
avcodec/ffv1enc: Fix size of first slice
Signed-off-by:
Michael Niedermayer
<
michael@niedermayer.cc
>
parent
51a055b2
release/6.1
n7.1-dev
n7.0.2
n7.0.1
n7.0
n6.2-dev
n6.1.2
n6.1.1
n6.1
n6.1-dev
n6.0.1
n6.0
n5.2-dev
n5.1.6
n5.1.5
n5.1.4
n5.1.3
n5.1.2
n5.1.1
n5.1
n5.1-dev
n5.0.3
n5.0.2
n5.0.1
n5.0
n4.5-dev
n4.4.5
n4.4.4
n4.4.3
n4.4.2
n4.4.1
n4.4
n4.4-dev
n4.3.8
n4.3.7
n4.3.6
n4.3.5
n4.3.4
n4.3.3
n4.3.2
n4.3.1
n4.3
n4.3-dev
n4.2.10
n4.2.9
n4.2.8
n4.2.7
n4.2.6
n4.2.5
n4.2.4
n4.2.3
n4.2.2
n4.2.1
n4.2
n4.2-dev
n4.1.11
n4.1.10
n4.1.9
n4.1.8
n4.1.7
n4.1.6
n4.1.5
n4.1.4
n4.1.3
n4.1.2
n4.1.1
n4.1
n4.1-dev
n4.0.6
n4.0.5
n4.0.4
n4.0.3
n4.0.2
n4.0.1
n4.0
n3.5-dev
n3.4.13
n3.4.12
n3.4.11
n3.4.10
n3.4.9
n3.4.8
n3.4.7
n3.4.6
n3.4.5
n3.4.4
n3.4.3
n3.4.2
n3.4.1
n3.4
n3.4-dev
n3.3.9
n3.3.8
n3.3.7
n3.3.6
n3.3.5
n3.3.4
n3.3.3
n3.3.2
n3.3.1
n3.3
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/ffv1enc.c
+9
-4
libavcodec/ffv1enc.c
with
9 additions
and
4 deletions
+9
-4
libavcodec/ffv1enc.c
+
9
-
4
View file @
cff1c0ed
...
...
@@ -1096,7 +1096,6 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
FFV1Context
*
f
=
avctx
->
priv_data
;
RangeCoder
*
const
c
=
&
f
->
slice_context
[
0
]
->
c
;
AVFrame
*
const
p
=
f
->
picture
.
f
;
int
used_count
=
0
;
uint8_t
keystate
=
128
;
uint8_t
*
buf_p
;
int
i
,
ret
;
...
...
@@ -1185,11 +1184,17 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
}
for
(
i
=
1
;
i
<
f
->
slice_count
;
i
++
)
{
for
(
i
=
0
;
i
<
f
->
slice_count
;
i
++
)
{
FFV1Context
*
fs
=
f
->
slice_context
[
i
];
uint8_t
*
start
=
pkt
->
data
+
(
pkt
->
size
-
used_count
)
*
(
int64_t
)
i
/
f
->
slice_count
;
uint8_t
*
start
=
pkt
->
data
+
pkt
->
size
*
(
int64_t
)
i
/
f
->
slice_count
;
int
len
=
pkt
->
size
/
f
->
slice_count
;
ff_init_range_encoder
(
&
fs
->
c
,
start
,
len
);
if
(
i
)
{
ff_init_range_encoder
(
&
fs
->
c
,
start
,
len
);
}
else
{
av_assert0
(
fs
->
c
.
bytestream_end
>=
fs
->
c
.
bytestream_start
+
len
);
av_assert0
(
fs
->
c
.
bytestream
<
fs
->
c
.
bytestream_start
+
len
);
fs
->
c
.
bytestream_end
=
fs
->
c
.
bytestream_start
+
len
;
}
}
avctx
->
execute
(
avctx
,
encode_slice
,
&
f
->
slice_context
[
0
],
NULL
,
f
->
slice_count
,
sizeof
(
void
*
));
...
...
This diff is collapsed.
Click to expand it.
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
Menu
Projects
Groups
Snippets
Help