diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-01-24 10:33:14 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-01-24 10:33:14 +0000 |
| commit | 4f59b684a6470d4dc337cc7abca662347039c8c6 (patch) | |
| tree | 4b6e2c7e6d7a3107303d7f20fbcbf15bf253c7b4 /libavcodec/x264.c | |
| parent | 12943a53b59994d88ec69a6759adc1fa13312870 (diff) | |
Remove all stray tabs and trailing whitespace, this time for good.
Originally committed as revision 4891 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x264.c')
| -rw-r--r-- | libavcodec/x264.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/x264.c b/libavcodec/x264.c index 31fe5cc65b..43d4eb8096 100644 --- a/libavcodec/x264.c +++ b/libavcodec/x264.c @@ -225,7 +225,7 @@ X264_init(AVCodecContext *avctx) if(avctx->level > 0) x4->params.i_level_idc = avctx->level; - x4->params.rc.f_rate_tolerance = + x4->params.rc.f_rate_tolerance = (float)avctx->bit_rate_tolerance/avctx->bit_rate; if((avctx->rc_buffer_size != 0) && @@ -258,14 +258,14 @@ X264_init(AVCodecContext *avctx) avctx->coded_frame = &x4->out_pic; if(avctx->flags & CODEC_FLAG_GLOBAL_HEADER){ - x264_nal_t *nal; - int nnal, i, s = 0; + x264_nal_t *nal; + int nnal, i, s = 0; - x264_encoder_headers(x4->enc, &nal, &nnal); + x264_encoder_headers(x4->enc, &nal, &nnal); - /* 5 bytes NAL header + worst case escaping */ - for(i = 0; i < nnal; i++) - s += 5 + nal[i].i_payload * 4 / 3; + /* 5 bytes NAL header + worst case escaping */ + for(i = 0; i < nnal; i++) + s += 5 + nal[i].i_payload * 4 / 3; avctx->extradata = av_malloc(s); avctx->extradata_size = encode_nals(avctx->extradata, s, nal, nnal); |