Skip to content

F
ffmpeg
Commit 05f228b0 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

ffv1: fix gray 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b6267901
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 10 deletions
libavcodec/ffv1.c
View file @ 05f228b0
...@@ -1296,11 +1296,7 @@ static int encode_slice(AVCodecContext *c, void *arg) ...@@ -1296,11 +1296,7 @@ static int encode_slice(AVCodecContext *c, void *arg)
int x = fs->slice_x; int x = fs->slice_x;
int y = fs->slice_y; int y = fs->slice_y;
AVFrame *const p = &f->picture; AVFrame *const p = &f->picture;
const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR) const int ps = av_pix_fmt_desc_get(c->pix_fmt)->comp[0].step_minus1 + 1;
?
(f->bits_per_raw_sample>8)+1
:
4;
if (p->key_frame) if (p->key_frame)
clear_slice_state(f, fs); clear_slice_state(f, fs);
...@@ -1735,11 +1731,7 @@ static int decode_slice(AVCodecContext *c, void *arg) ...@@ -1735,11 +1731,7 @@ static int decode_slice(AVCodecContext *c, void *arg)
FFV1Context *fs = *(void **)arg; FFV1Context *fs = *(void **)arg;
FFV1Context *f = fs->avctx->priv_data; FFV1Context *f = fs->avctx->priv_data;
int width, height, x, y; int width, height, x, y;
const int ps = (av_pix_fmt_desc_get(c->pix_fmt)->flags & PIX_FMT_PLANAR) const int ps = av_pix_fmt_desc_get(c->pix_fmt)->comp[0].step_minus1 + 1;
?
(c->bits_per_raw_sample>8)+1
:
4;
AVFrame * const p = &f->picture; AVFrame * const p = &f->picture;
if (f->version > 2) { if (f->version > 2) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment