diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:57:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 12:57:54 +0100 |
| commit | 3c1326411d6ffd2f30c0d6e8cc32d34b5ed5a518 (patch) | |
| tree | 5f6ed62d87937c9637758deddb16867b9c0b9966 | |
| parent | a303dce28c9b3e7d532334907dd6cdca8fd6042c (diff) | |
| parent | 37045e422903695e610cca6ecb753df643ab9380 (diff) | |
| download | ffmpeg-3c1326411d6ffd2f30c0d6e8cc32d34b5ed5a518.tar.gz | |
Merge commit '37045e422903695e610cca6ecb753df643ab9380'
* commit '37045e422903695e610cca6ecb753df643ab9380':
mpegvideo: drop vismv code
Conflicts:
libavcodec/mpegvideo.c
vismv code works fine, and thus only the unused fields are droped
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.c | 3 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index a8a8f0bbed..2b8be33985 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -1189,9 +1189,6 @@ static int free_context_frame(MpegEncContext *s) s->linesize = s->uvlinesize = 0; - for (i = 0; i < 3; i++) - av_freep(&s->visualization_buffer[i]); - return 0; } diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 41850df377..a5831fa3bf 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -343,7 +343,6 @@ typedef struct MpegEncContext { Picture *last_picture_ptr; ///< pointer to the previous picture. Picture *next_picture_ptr; ///< pointer to the next picture (for bidir pred) 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 int16_t *dc_val_base; int16_t *dc_val[3]; ///< used for mpeg4 DC prediction, all 3 arrays must be continuous |