diff options
| author | James Zern <jzern@google.com> | 2010-10-22 18:09:14 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-10-22 18:09:14 +0000 |
| commit | 2aa72ecccc0610f49d3883e401202e95afc5d2a4 (patch) | |
| tree | c0ec1f3247a5c0c158bfd3b6ed9c00964d890cfa /libavcodec/libx264.c | |
| parent | f9b4eef457dde49f1297f32a02f443cf9e1bc481 (diff) | |
| download | ffmpeg-2aa72ecccc0610f49d3883e401202e95afc5d2a4.tar.gz | |
Add new -slices option and use it for libvpx and libx264.
Patch by James Zern, jzern google
Originally committed as revision 25551 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/libx264.c')
| -rw-r--r-- | libavcodec/libx264.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 8387f41286..7ce04a62cc 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -294,6 +294,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.b_interlaced = avctx->flags & CODEC_FLAG_INTERLACED_DCT; + x4->params.i_slice_count = avctx->slices; + if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) x4->params.b_repeat_headers = 0; |