projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0adba3d
)
fix frametypes with xvid_rc
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 18 Mar 2006 20:43:48 +0000
(20:43 +0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 18 Mar 2006 20:43:48 +0000
(20:43 +0000)
Originally committed as revision 5180 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavcodec/ratecontrol.c
patch
|
blob
|
history
diff --git
a/libavcodec/ratecontrol.c
b/libavcodec/ratecontrol.c
index
a6f8036
..
3ca6f9d
100644
(file)
--- a/
libavcodec/ratecontrol.c
+++ b/
libavcodec/ratecontrol.c
@@
-117,6
+117,9
@@
int ff_rate_control_init(MpegEncContext *s)
p= next;
}
+
+ if(init_pass2(s) < 0) return -1;
+
//FIXME maybe move to end
if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
#ifdef CONFIG_XVID
@@
-126,8
+129,6
@@
int ff_rate_control_init(MpegEncContext *s)
return -1;
#endif
}
-
- if(init_pass2(s) < 0) return -1;
}
if(!(s->flags&CODEC_FLAG_PASS2)){