diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 21:41:56 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-13 22:08:27 +0200 |
| commit | af285072b5d226bb0032b8576d132d01e2d22fa1 (patch) | |
| tree | b617e797884eac90194f94e37eaa656ea70e73fb /libavcodec/ffv1.c | |
| parent | 051dd2eea61b5668bad55a3b7252b834882afd0c (diff) | |
| download | ffmpeg-af285072b5d226bb0032b8576d132d01e2d22fa1.tar.gz | |
ffv1enc: use default number of slices if unspecified
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.c')
| -rw-r--r-- | libavcodec/ffv1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 7a07980af6..79e512def4 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -1106,7 +1106,7 @@ static av_cold int encode_init(AVCodecContext *avctx) if(s->version>1){ for(s->num_v_slices=2; s->num_v_slices<9; s->num_v_slices++){ for(s->num_h_slices=s->num_v_slices; s->num_h_slices<2*s->num_v_slices; s->num_h_slices++){ - if(avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= 64) + if(avctx->slices == s->num_h_slices * s->num_v_slices && avctx->slices <= 64 || !avctx->slices) goto slices_ok; } } |