Commit 3c132641 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '37045e42'

* commit '37045e42':
  mpegvideo: drop vismv code

Conflicts:
	libavcodec/mpegvideo.c

vismv code works fine, and thus only the unused fields are droped
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents a303dce2 37045e42
...@@ -1189,9 +1189,6 @@ static int free_context_frame(MpegEncContext *s) ...@@ -1189,9 +1189,6 @@ static int free_context_frame(MpegEncContext *s)
s->linesize = s->uvlinesize = 0; s->linesize = s->uvlinesize = 0;
for (i = 0; i < 3; i++)
av_freep(&s->visualization_buffer[i]);
return 0; return 0;
} }
......
...@@ -343,7 +343,6 @@ typedef struct MpegEncContext { ...@@ -343,7 +343,6 @@ typedef struct MpegEncContext {
Picture *last_picture_ptr; ///< pointer to the previous picture. Picture *last_picture_ptr; ///< pointer to the previous picture.
Picture *next_picture_ptr; ///< pointer to the next picture (for bidir pred) Picture *next_picture_ptr; ///< pointer to the next picture (for bidir pred)
Picture *current_picture_ptr; ///< pointer to the current picture Picture *current_picture_ptr; ///< pointer to the current picture
uint8_t *visualization_buffer[3]; ///< temporary buffer vor MV visualization
int last_dc[3]; ///< last DC values for MPEG1 int last_dc[3]; ///< last DC values for MPEG1
int16_t *dc_val_base; int16_t *dc_val_base;
int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous
......
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