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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/img2enc.c | 2 | ||||
| -rw-r--r-- | libavformat/mxfenc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index 5dd4c77..48454fe 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -117,7 +117,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) if (img->split_planes) { int ysize = codec->width * codec->height; int usize = FF_CEIL_RSHIFT(codec->width, desc->log2_chroma_w) * FF_CEIL_RSHIFT(codec->height, desc->log2_chroma_h); - if (desc->comp[0].depth_minus1 >= 8) { + if (desc->comp[0].depth >= 9) { ysize *= 2; usize *= 2; } diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 142c870..546d983 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -2058,7 +2058,7 @@ static int mxf_write_header(AVFormatContext *s) sc->color_siting = 0xFF; if (pix_desc) { - sc->component_depth = pix_desc->comp[0].depth_minus1 + 1; + sc->component_depth = pix_desc->comp[0].depth; sc->h_chroma_sub_sample = 1 << pix_desc->log2_chroma_w; } switch (ff_choose_chroma_location(s, st)) { |
