[FFmpeg-cvslog] ffv1enc: use default number of slices if unspecified
Michael Niedermayer
git at videolan.org
Fri Jul 13 22:13:35 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jul 13 21:41:56 2012 +0200| [af285072b5d226bb0032b8576d132d01e2d22fa1] | committer: Michael Niedermayer
ffv1enc: use default number of slices if unspecified
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=af285072b5d226bb0032b8576d132d01e2d22fa1
---
libavcodec/ffv1.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 7a07980..79e512d 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;
}
}
More information about the ffmpeg-cvslog
mailing list