Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
VideoLAN
x264
Commits
c47120f0
Commit
c47120f0
authored
Aug 20, 2008
by
Loren Merritt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
r940 broke threads
parent
968609dc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
common/common.h
common/common.h
+6
-0
encoder/encoder.c
encoder/encoder.c
+0
-1
No files found.
common/common.h
View file @
c47120f0
...
...
@@ -262,6 +262,8 @@ struct x264_t
int
i_frame_size
;
}
out
;
/**** thread synchronization starts here ****/
/* frame number/poc */
int
i_frame
;
...
...
@@ -404,6 +406,10 @@ struct x264_t
int
i_mb_prev_xy
;
int
i_mb_top_xy
;
/**** thread synchronization ends here ****/
/* subsequence variables are either thread-local or constant,
* and won't be copied from one thread to another */
/* mb table */
int8_t
*
type
;
/* mb type */
int8_t
*
qp
;
/* mb qp */
...
...
encoder/encoder.c
View file @
c47120f0
...
...
@@ -1258,7 +1258,6 @@ static void x264_thread_sync_context( x264_t *dst, x264_t *src )
// copy everything except the per-thread pointers and the constants.
memcpy
(
&
dst
->
i_frame
,
&
src
->
i_frame
,
offsetof
(
x264_t
,
mb
.
type
)
-
offsetof
(
x264_t
,
i_frame
)
);
memcpy
(
&
dst
->
mb
.
i_type
,
&
src
->
mb
.
i_type
,
offsetof
(
x264_t
,
rc
)
-
offsetof
(
x264_t
,
mb
.
i_type
)
);
dst
->
stat
=
src
->
stat
;
}
...
...
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