diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | 5f390eef8ee2b8adab00c5d2923a52aa261eb999 (patch) | |
| tree | 795f383dbe4f784c2d9bebe4ea517efc6241606b /libavcodec/h264.h | |
| parent | 99a35d1ccbb6b6cd260ce5c8369a897a79fe6a3a (diff) | |
| download | ffmpeg-5f390eef8ee2b8adab00c5d2923a52aa261eb999.tar.gz | |
h264: move mb_[uv]linesize into the per-slice context
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 8ed84b4469..772795010f 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -342,6 +342,9 @@ typedef struct H264SliceContext { unsigned int topright_samples_available; unsigned int left_samples_available; + ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff + ptrdiff_t mb_uvlinesize; + /** * number of neighbors (top and/or left) that used 8x8 dct */ @@ -413,9 +416,6 @@ typedef struct H264Context { uint32_t *mb2br_xy; int b_stride; // FIXME use s->b4_stride - ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff - ptrdiff_t mb_uvlinesize; - SPS sps; ///< current sps PPS pps; ///< current pps |