Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
5cd6513f
Commit
5cd6513f
authored
11 years ago
by
Anton Khirnov
Browse files
Options
Downloads
Patches
Plain Diff
pthread: drop avcodec_ prefixes from static functions
parent
694d997a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/pthread.c
+8
-8
8 additions, 8 deletions
libavcodec/pthread.c
with
8 additions
and
8 deletions
libavcodec/pthread.c
+
8
−
8
View file @
5cd6513f
...
@@ -174,7 +174,7 @@ static void* attribute_align_arg worker(void *v)
...
@@ -174,7 +174,7 @@ static void* attribute_align_arg worker(void *v)
}
}
}
}
static
av_always_inline
void
avcodec_
thread_park_workers
(
ThreadContext
*
c
,
int
thread_count
)
static
av_always_inline
void
thread_park_workers
(
ThreadContext
*
c
,
int
thread_count
)
{
{
while
(
c
->
current_job
!=
thread_count
+
c
->
job_count
)
while
(
c
->
current_job
!=
thread_count
+
c
->
job_count
)
pthread_cond_wait
(
&
c
->
last_job_cond
,
&
c
->
current_job_lock
);
pthread_cond_wait
(
&
c
->
last_job_cond
,
&
c
->
current_job_lock
);
...
@@ -201,7 +201,7 @@ static void thread_free(AVCodecContext *avctx)
...
@@ -201,7 +201,7 @@ static void thread_free(AVCodecContext *avctx)
av_freep
(
&
avctx
->
thread_opaque
);
av_freep
(
&
avctx
->
thread_opaque
);
}
}
static
int
avcodec_
thread_execute
(
AVCodecContext
*
avctx
,
action_func
*
func
,
void
*
arg
,
int
*
ret
,
int
job_count
,
int
job_size
)
static
int
thread_execute
(
AVCodecContext
*
avctx
,
action_func
*
func
,
void
*
arg
,
int
*
ret
,
int
job_count
,
int
job_size
)
{
{
ThreadContext
*
c
=
avctx
->
thread_opaque
;
ThreadContext
*
c
=
avctx
->
thread_opaque
;
int
dummy_ret
;
int
dummy_ret
;
...
@@ -229,16 +229,16 @@ static int avcodec_thread_execute(AVCodecContext *avctx, action_func* func, void
...
@@ -229,16 +229,16 @@ static int avcodec_thread_execute(AVCodecContext *avctx, action_func* func, void
c
->
current_execute
++
;
c
->
current_execute
++
;
pthread_cond_broadcast
(
&
c
->
current_job_cond
);
pthread_cond_broadcast
(
&
c
->
current_job_cond
);
avcodec_
thread_park_workers
(
c
,
avctx
->
thread_count
);
thread_park_workers
(
c
,
avctx
->
thread_count
);
return
0
;
return
0
;
}
}
static
int
avcodec_
thread_execute2
(
AVCodecContext
*
avctx
,
action_func2
*
func2
,
void
*
arg
,
int
*
ret
,
int
job_count
)
static
int
thread_execute2
(
AVCodecContext
*
avctx
,
action_func2
*
func2
,
void
*
arg
,
int
*
ret
,
int
job_count
)
{
{
ThreadContext
*
c
=
avctx
->
thread_opaque
;
ThreadContext
*
c
=
avctx
->
thread_opaque
;
c
->
func2
=
func2
;
c
->
func2
=
func2
;
return
avcodec_
thread_execute
(
avctx
,
NULL
,
arg
,
ret
,
job_count
,
0
);
return
thread_execute
(
avctx
,
NULL
,
arg
,
ret
,
job_count
,
0
);
}
}
static
int
thread_init_internal
(
AVCodecContext
*
avctx
)
static
int
thread_init_internal
(
AVCodecContext
*
avctx
)
...
@@ -290,10 +290,10 @@ static int thread_init_internal(AVCodecContext *avctx)
...
@@ -290,10 +290,10 @@ static int thread_init_internal(AVCodecContext *avctx)
}
}
}
}
avcodec_
thread_park_workers
(
c
,
thread_count
);
thread_park_workers
(
c
,
thread_count
);
avctx
->
execute
=
avcodec_
thread_execute
;
avctx
->
execute
=
thread_execute
;
avctx
->
execute2
=
avcodec_
thread_execute2
;
avctx
->
execute2
=
thread_execute2
;
return
0
;
return
0
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment