diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:25:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:25:24 +0100 |
| commit | d1bbd304bf608c9ca5fe747a8ee317e4c4e0ecbe (patch) | |
| tree | cb34d55aa421569fd67f0819d56b21aeac348075 /libavcodec/mpegvideo.h | |
| parent | 3c8085dc4250a98405eb64b3765f4ceb8d177c00 (diff) | |
| parent | f81c37e40fe3236d54da12aef9cdba48ba70ec31 (diff) | |
| download | ffmpeg-d1bbd304bf608c9ca5fe747a8ee317e4c4e0ecbe.tar.gz | |
Merge commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31'
* commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31':
vf_delogo: fix an uninitialized read.
h264: remove obsolete comment.
mpegvideo: remove some unused variables from Picture.
utvideoenc/v410enc: do not set AVFrame.reference.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 03f4f9ff1e..8e704a6af2 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -94,10 +94,6 @@ struct MpegEncContext; typedef struct Picture{ struct AVFrame f; - /** - * halfpel luma planes. - */ - uint8_t *interpolated[3]; int8_t *qscale_table_base; int16_t (*motion_val_base[2])[2]; uint32_t *mb_type_base; @@ -144,7 +140,6 @@ typedef struct Picture{ uint16_t *mb_var; ///< Table for MB variances uint16_t *mc_mb_var; ///< Table for motion compensated MB variances uint8_t *mb_mean; ///< Table for MB luminance - int32_t *mb_cmp_score; ///< Table for MB cmp scores, for mb decision FIXME remove int b_frame_score; /* */ struct MpegEncContext *owner2; ///< pointer to the MpegEncContext that allocated this picture int needs_realloc; ///< Picture needs to be reallocated (eg due to a frame size change) |