[FFmpeg-cvslog] ffv1: set slice geometry based on user specified slices.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr  8 17:03:38 2012 +0200| [1d80c8db272baaa9b0334fe68119176477d0b60e] | committer: Michael Niedermayer

ffv1: set slice geometry based on user specified slices.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1d80c8db272baaa9b0334fe68119176477d0b60e
---

 libavcodec/ffv1.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 4c8ef4b..681b363 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1065,8 +1065,15 @@ static av_cold int encode_init(AVCodecContext *avctx)
     }
 
     if(s->version>1){
-        s->num_h_slices=2;
-        s->num_v_slices=2;
+        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)
+                    goto slices_ok;
+            }
+        }
+        av_log(avctx, AV_LOG_ERROR, "Unsupported number %d of slices requested\n", avctx->slices);
+        return -1;
+        slices_ok:
         write_extra_header(s);
     }