RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '3fbad00714698f59c6326edfcc63db87f525e7c0' 

* commit '3fbad00714698f59c6326edfcc63db87f525e7c0':
  utvideoenc: Enable support for multiple slices and use them

Conflicts:
	libavcodec/utvideoenc.c
	tests/fate/utvideo.mak

See: efec857c9f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-14 21:49:52 +01:00
parent efec857c9f 3fbad00714
commit e136579ca3
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/utvideoenc.c
View File

@ -207,11 +207,10 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx)
if (!avctx->slices) {
c->slices = subsampled_height / 120;
if (!c->slices) {
if (!c->slices)
c->slices = 1;
} else if (c->slices > 256) {
else if (c->slices > 256)
c->slices = 256;
}
} else {
c->slices = avctx->slices;
}