diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:10:48 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:10:48 +0200 |
| commit | 5d8e836d0ec3bcaabf5bc2020210a1bc61975922 (patch) | |
| tree | 8ff87745055d571431ded709218556357b18341c /libavcodec/utils.c | |
| parent | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (diff) | |
| download | ffmpeg-streaming-5d8e836d0ec3bcaabf5bc2020210a1bc61975922.zip ffmpeg-streaming-5d8e836d0ec3bcaabf5bc2020210a1bc61975922.tar.gz | |
Replace all remaining occurances of step/depth_minus1 and offset_plus1
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 5f3faf0..81bc215 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -700,7 +700,7 @@ void avpriv_color_frame(AVFrame *frame, const int c[4]) int bytes = is_chroma ? FF_CEIL_RSHIFT(frame->width, desc->log2_chroma_w) : frame->width; int height = is_chroma ? FF_CEIL_RSHIFT(frame->height, desc->log2_chroma_h) : frame->height; for (y = 0; y < height; y++) { - if (desc->comp[0].depth_minus1 >= 8) { + if (desc->comp[0].depth >= 9) { for (x = 0; x<bytes; x++) ((uint16_t*)dst)[x] = c[p]; }else @@ -2705,7 +2705,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) "%s", enc->pix_fmt == AV_PIX_FMT_NONE ? "none" : av_get_pix_fmt_name(enc->pix_fmt)); if (enc->bits_per_raw_sample && enc->pix_fmt != AV_PIX_FMT_NONE && - enc->bits_per_raw_sample <= av_pix_fmt_desc_get(enc->pix_fmt)->comp[0].depth_minus1) + enc->bits_per_raw_sample < av_pix_fmt_desc_get(enc->pix_fmt)->comp[0].depth) av_strlcatf(detail, sizeof(detail), "%d bpc, ", enc->bits_per_raw_sample); if (enc->color_range != AVCOL_RANGE_UNSPECIFIED) av_strlcatf(detail, sizeof(detail), "%s, ", |
