git.videolan.org
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
work with latest svn of x264
[ffmpeg.git]
/
libavcodec
/
x264.c
diff --git
a/libavcodec/x264.c
b/libavcodec/x264.c
index
c04a2e6
..
0f84139
100644
(file)
--- a/
libavcodec/x264.c
+++ b/
libavcodec/x264.c
@@
-133,7
+133,7
@@
X264_init(AVCodecContext *avctx)
x4->params.i_keyint_max = avctx->gop_size;
x4->params.rc.i_bitrate = avctx->bit_rate / 1000;
x4->params.i_keyint_max = avctx->gop_size;
x4->params.rc.i_bitrate = avctx->bit_rate / 1000;
- x4->params.rc.i_
rc
_buffer_size = avctx->rc_buffer_size / 1000;
+ x4->params.rc.i_
vbv
_buffer_size = avctx->rc_buffer_size / 1000;
if(avctx->rc_buffer_size)
x4->params.rc.b_cbr = 1;
x4->params.i_bframe = avctx->max_b_frames;
if(avctx->rc_buffer_size)
x4->params.rc.b_cbr = 1;
x4->params.i_bframe = avctx->max_b_frames;