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:
e4cb187
)
10l
author
Michael Niedermayer
<michaelni@gmx.at>
Thu, 29 Apr 2004 22:12:29 +0000
(22:12 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Thu, 29 Apr 2004 22:12:29 +0000
(22:12 +0000)
Originally committed as revision 3088 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/mpegvideo.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpegvideo.c
b/libavcodec/mpegvideo.c
index
29804b7
..
7b97e15
100644
(file)
--- a/
libavcodec/mpegvideo.c
+++ b/
libavcodec/mpegvideo.c
@@
-597,6
+597,11
@@
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){
+ av_log(s->avctx, AV_LOG_ERROR, "too many threads\n");
+ return -1;
+ }
+
dsputil_init(&s->dsp, s->avctx);
DCT_common_init(s);
@@
-990,11
+995,6
@@
int MPV_encode_init(AVCodecContext *avctx)
return -1;
}
- if(s->avctx->thread_count > MAX_THREADS || 16*s->avctx->thread_count > s->height){
- av_log(avctx, AV_LOG_ERROR, "too many threads\n");
- return -1;
- }
-
if(s->avctx->thread_count > 1)
s->rtp_mode= 1;