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:
d1700ea
)
10l
author
Michael Niedermayer
<michaelni@gmx.at>
Fri, 30 Apr 2004 01:35:45 +0000
(
01:35
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Fri, 30 Apr 2004 01:35:45 +0000
(
01:35
+0000)
Originally committed as revision 3090 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mpegvideo.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo.c
b/libavcodec/mpegvideo.c
index
7b97e15
..
772775c
100644
(file)
--- a/
libavcodec/mpegvideo.c
+++ b/
libavcodec/mpegvideo.c
@@
-597,7
+597,7
@@
int MPV_common_init(MpegEncContext *s)
{
int y_size, c_size, yc_size, i, mb_array_size, mv_table_size, x, y;
- if(s->avctx->thread_count > MAX_THREADS ||
16*s->avctx->thread_count > s->height
){
+ if(s->avctx->thread_count > MAX_THREADS ||
(16*s->avctx->thread_count > s->height && s->height)
){
av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
return -1;
}