Quoting Vittorio Giovara (2015-07-10 16:32:53) > On Fri, Jul 10, 2015 at 2:54 PM, Anton Khirnov <[email protected]> wrote: > > Quoting Vittorio Giovara (2015-06-30 15:50:19) > >> --- > >> libavcodec/libxvid.c | 18 +++++++++--------- > >> 1 file changed, 9 insertions(+), 9 deletions(-) > >> > >> diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c > >> index 97ff95b..0012876 100644 > >> --- a/libavcodec/libxvid.c > >> +++ b/libavcodec/libxvid.c > >> @@ -663,7 +663,6 @@ static int xvid_encode_frame(AVCodecContext *avctx, > >> AVPacket *pkt, > >> { > >> int xerr, i, ret, user_packet = !!pkt->data; > >> struct xvid_context *x = avctx->priv_data; > >> - AVFrame *p = avctx->coded_frame; > >> int mb_width = (avctx->width + 15) / 16; > >> int mb_height = (avctx->height + 15) / 16; > >> char *tmp; > >> @@ -749,23 +748,24 @@ static int xvid_encode_frame(AVCodecContext *avctx, > >> AVPacket *pkt, > >> if (xerr > 0) { > >> *got_packet = 1; > >> > >> - p->quality = xvid_enc_stats.quant * FF_QP2LAMBDA; > >> + avctx->coded_frame->quality = xvid_enc_stats.quant * FF_QP2LAMBDA; > >> if (xvid_enc_stats.type == XVID_TYPE_PVOP) > >> - p->pict_type = AV_PICTURE_TYPE_P; > >> + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_P; > >> else if (xvid_enc_stats.type == XVID_TYPE_BVOP) > >> - p->pict_type = AV_PICTURE_TYPE_B; > >> + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_B; > >> else if (xvid_enc_stats.type == XVID_TYPE_SVOP) > >> - p->pict_type = AV_PICTURE_TYPE_S; > >> + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_S; > >> else > >> - p->pict_type = AV_PICTURE_TYPE_I; > >> + avctx->coded_frame->pict_type = AV_PICTURE_TYPE_I; > >> if (xvid_enc_frame.out_flags & XVID_KEYFRAME) { > >> - p->key_frame = 1; > >> + avctx->coded_frame->key_frame = 1; > >> pkt->flags |= AV_PKT_FLAG_KEY; > >> if (x->quicktime_format) > >> return xvid_strip_vol_header(avctx, pkt, > >> xvid_enc_stats.hlength, > >> xerr); > >> - } else > >> - p->key_frame = 0; > >> + } else { > >> + avctx->coded_frame->key_frame = 0; > >> + } > >> > >> pkt->size = xerr; > >> > >> -- > >> 1.9.5 (Apple Git-50.3) > > > > If I'm reading right, this patch is a no-op that just replaces a local > > variable with a longer name for the same. > > Yes, it is mainly to simplify wrapping this section with an #if block later > on. > Is it ok if I mention this in the commit?
I'd very much appreciate it, if this was explained fully in the first patch that does this. You abuse poor 'entangle' as a weasel word which does not really say anything about what is actually being done or why. -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
