Commit b3d48c31 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c1f92d13'

* commit 'c1f92d13':
  mpegvideo: remove unused MpegEncContext.b4_stride
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 8b30702c c1f92d13
......@@ -1085,7 +1085,6 @@ static int init_context_frame(MpegEncContext *s)
s->mb_width = (s->width + 15) / 16;
s->mb_stride = s->mb_width + 1;
s->b8_stride = s->mb_width * 2 + 1;
s->b4_stride = s->mb_width * 4 + 1;
mb_array_size = s->mb_height * s->mb_stride;
mv_table_size = (s->mb_height + 2) * s->mb_stride + 1;
......
......@@ -253,7 +253,6 @@ typedef struct MpegEncContext {
int mb_width, mb_height; ///< number of MBs horizontally & vertically
int mb_stride; ///< mb_width+1 used for some arrays to allow simple addressing of left & top MBs without sig11
int b8_stride; ///< 2*mb_width+1 used for some 8x8 block arrays to allow simple addressing
int b4_stride; ///< 4*mb_width+1 used for some 4x4 block arrays to allow simple addressing
int h_edge_pos, v_edge_pos;///< horizontal / vertical position of the right/bottom edge (pixel replication)
int mb_num; ///< number of MBs of a picture
ptrdiff_t linesize; ///< line size, in bytes, may be different from width
......
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