Merge commit '37045e422903695e610cca6ecb753df643ab9380'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 11:57:54 +0000 (12:57 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 11:57:54 +0000 (12:57 +0100)
* 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>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h

index a8a8f0b..2b8be33 100644 (file)
@@ -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;
 }
 
index 41850df..a5831fa 100644 (file)
@@ -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