OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e1e8bf
)
Remove incorrect return statement from avcodec_thread_free()
author
Mans Rullgard
<mans@mansr.com>
Thu, 10 Feb 2011 12:21:19 +0000
(12:21 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 11 Feb 2011 01:54:09 +0000
(
02:54
+0100)
The function return type is void, so a return statement with an
expression is forbidden (and pointless).
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit
b4668274b944abae61759e796c5cc36ade510f24
)
libavcodec/utils.c
patch
|
blob
|
history
diff --git
a/libavcodec/utils.c
b/libavcodec/utils.c
index
8e5cfd5
..
2d62f07
100644
(file)
--- a/
libavcodec/utils.c
+++ b/
libavcodec/utils.c
@@
-1340,7
+1340,7
@@
int avcodec_thread_init(AVCodecContext *s, int thread_count)
void avcodec_thread_free(AVCodecContext *s)
{
#if HAVE_THREADS
-
return
ff_thread_free(s);
+ ff_thread_free(s);
#endif
}