[FFmpeg-cvslog] ffv1: fix gray

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Oct 21 04:25:30 2012 +0200| [05f228b0a01e8b97ba73a15c1eccb6b0a9060633] | committer: Michael Niedermayer

ffv1: fix gray

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

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

 libavcodec/ffv1.c |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 0894f5f..0dedc0d 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1296,11 +1296,7 @@ static int encode_slice(AVCodecContext *c, void *arg)
     int x            = fs->slice_x;
     int y            = fs->slice_y;
     AVFrame *const p = &f->picture;
-    const int ps     = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
-                            ?
-                       (f->bits_per_raw_sample>8)+1
-                            :
-                       4;
+    const int ps     = av_pix_fmt_desc_get(c->pix_fmt)->comp[0].step_minus1 + 1;
 
     if (p->key_frame)
         clear_slice_state(f, fs);
@@ -1735,11 +1731,7 @@ static int decode_slice(AVCodecContext *c, void *arg)
     FFV1Context *fs  = *(void **)arg;
     FFV1Context *f   = fs->avctx->priv_data;
     int width, height, x, y;
-    const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR)
-                        ?
-                   (c->bits_per_raw_sample>8)+1
-                        :
-                    4;
+    const int ps      = av_pix_fmt_desc_get(c->pix_fmt)->comp[0].step_minus1 + 1;
     AVFrame * const p = &f->picture;
 
     if (f->version > 2) {