From 231fd1ed3932909a259da6df52fa3f756646aa3e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 7 Jan 2013 11:39:56 +0100 Subject: [PATCH 1/4] utvideoenc/v410enc: do not set AVFrame.reference. That field will be deprecated. --- libavcodec/utvideoenc.c | 1 - libavcodec/v410enc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c index 085c415caa..0df3fb75d1 100644 --- a/libavcodec/utvideoenc.c +++ b/libavcodec/utvideoenc.c @@ -598,7 +598,6 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt, * At least currently Ut Video is IDR only. * Set flags accordingly. */ - avctx->coded_frame->reference = 0; avctx->coded_frame->key_frame = 1; avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; diff --git a/libavcodec/v410enc.c b/libavcodec/v410enc.c index cc7cef7ea2..7bb70fd56a 100644 --- a/libavcodec/v410enc.c +++ b/libavcodec/v410enc.c @@ -56,7 +56,6 @@ static int v410_encode_frame(AVCodecContext *avctx, AVPacket *pkt, } dst = pkt->data; - avctx->coded_frame->reference = 0; avctx->coded_frame->key_frame = 1; avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; From 47318953ddfe8aa7dd00ad90bd21ea3a995e35d0 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sun, 13 Jan 2013 17:54:50 +0100 Subject: [PATCH 2/4] mpegvideo: remove some unused variables from Picture. --- libavcodec/motion_est.c | 2 -- libavcodec/mpegvideo.h | 5 ----- 2 files changed, 7 deletions(-) diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index 9cf1203be0..3244ac06b9 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -1077,7 +1077,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, vard = s->dsp.sse[0](NULL, pix, ppix, s->linesize, 16); pic->mc_mb_var[s->mb_stride * mb_y + mb_x] = (vard+128)>>8; -// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; c->mc_mb_var_sum_temp += (vard+128)>>8; if(mb_type){ @@ -1156,7 +1155,6 @@ void ff_estimate_p_frame_motion(MpegEncContext * s, } } -// pic->mb_cmp_score[s->mb_stride * mb_y + mb_x] = dmin; set_p_mv_tables(s, mx, my, mb_type!=CANDIDATE_MB_TYPE_INTER4V); /* get intra luma score */ diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 567319c27b..a2a5d7b876 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; @@ -143,7 +139,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) From 76e74e4831f08876f1f3d30a1640b0d084bed64a Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 19 Jan 2013 09:15:37 +0100 Subject: [PATCH 3/4] h264: remove obsolete comment. --- libavcodec/h264.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index ffe7586ad8..a903b7b93b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1415,7 +1415,6 @@ static void decode_postinit(H264Context *h, int setup_finished) cur->f.repeat_pict = 1; break; case SEI_PIC_STRUCT_FRAME_DOUBLING: - // Force progressive here, doubling interlaced frame is a bad idea. cur->f.repeat_pict = 2; break; case SEI_PIC_STRUCT_FRAME_TRIPLING: From f81c37e40fe3236d54da12aef9cdba48ba70ec31 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 21 Jan 2013 21:10:54 +0100 Subject: [PATCH 4/4] vf_delogo: fix an uninitialized read. CC:libav-stable@libav.org --- libavfilter/vf_delogo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/vf_delogo.c b/libavfilter/vf_delogo.c index 76848c3198..5d56444e20 100644 --- a/libavfilter/vf_delogo.c +++ b/libavfilter/vf_delogo.c @@ -223,7 +223,7 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *in) AVFilterBufferRef *out; int hsub0 = desc->log2_chroma_w; int vsub0 = desc->log2_chroma_h; - int direct; + int direct = 0; int plane; if ((in->perms & AV_PERM_WRITE) && !(in->perms & AV_PERM_PRESERVE)) {