diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 23:16:36 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 23:16:36 +0100 |
commit | fa7c08d5e192aea77fdfb7f52c44c196a3ba4452 (patch) | |
tree | 7089b439143302515c4f0339b617b0e88004a6cd /libavcodec/h264.h | |
parent | a6cb0534e2b5e91c119c77165bc65a6ff14e649b (diff) | |
parent | c28ed1d743443e783537d279ae721be3bbdf7646 (diff) | |
download | ffmpeg-fa7c08d5e192aea77fdfb7f52c44c196a3ba4452.tar.gz |
Merge commit 'c28ed1d743443e783537d279ae721be3bbdf7646'
* commit 'c28ed1d743443e783537d279ae721be3bbdf7646':
h264: move [uv]linesize to the per-slice context
Conflicts:
libavcodec/h264_mb.c
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
-rw-r--r-- | libavcodec/h264.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 2c38a246b6..949b7cb250 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -403,6 +403,7 @@ typedef struct H264SliceContext { unsigned int topright_samples_available; unsigned int left_samples_available; + ptrdiff_t linesize, uvlinesize; ptrdiff_t mb_linesize; ///< may be equal to s->linesize or s->linesize * 2, for mbaff ptrdiff_t mb_uvlinesize; @@ -517,7 +518,6 @@ typedef struct H264Context { /* coded dimensions -- 16 * mb w/h */ int width, height; - ptrdiff_t linesize, uvlinesize; int chroma_x_shift, chroma_y_shift; int droppable; |