diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:28:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-30 00:28:51 +0200 |
| commit | b3d48c315dece7bc599012075cc92e9a80cdd6ec (patch) | |
| tree | b5ba1474ee20adf7b264bc14e1b8439163beb525 /libavcodec | |
| parent | 8b30702c44040c13abe759fa48673af7af417de9 (diff) | |
| parent | c1f92d13589d431e576d719dd44427486a5e05cd (diff) | |
| download | ffmpeg-b3d48c315dece7bc599012075cc92e9a80cdd6ec.tar.gz | |
Merge commit 'c1f92d13589d431e576d719dd44427486a5e05cd'
* commit 'c1f92d13589d431e576d719dd44427486a5e05cd':
mpegvideo: remove unused MpegEncContext.b4_stride
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7d9da5c106..48897d4998 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 959b927011..8f77db3946 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -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 |