On 2013-02-13 19:51:07 +0100, Anton Khirnov wrote:
> Do not export them in AVFrame, since the corresponding field will be
> removed.
> ---
> libavcodec/mpegvideo.c | 11 ++---------
> 1 file changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
> index c32807c..4501368 100644
> --- a/libavcodec/mpegvideo.c
> +++ b/libavcodec/mpegvideo.c
> @@ -427,10 +427,6 @@ int ff_alloc_picture(MpegEncContext *s, Picture *pic,
> int shared)
> }
> pic->f.motion_subsample_log2 = 3;
> }
> - if (s->avctx->debug&FF_DEBUG_DCT_COEFF) {
> - FF_ALLOCZ_OR_GOTO(s->avctx, pic->f.dct_coeff,
> - 64 * mb_array_size * sizeof(int16_t) * 6, fail)
> - }
> pic->f.qstride = s->mb_stride;
> FF_ALLOCZ_OR_GOTO(s->avctx, pic->f.pan_scan,
> 1 * sizeof(AVPanScan), fail)
> @@ -463,7 +459,6 @@ static void free_picture(MpegEncContext *s, Picture *pic)
> av_freep(&pic->qscale_table_base);
> pic->qscale_table = NULL;
> av_freep(&pic->mb_type_base);
> - av_freep(&pic->f.dct_coeff);
> av_freep(&pic->f.pan_scan);
> pic->mb_type = NULL;
> for (i = 0; i < 2; i++) {
> @@ -2227,14 +2222,12 @@ void MPV_decode_mb_internal(MpegEncContext *s,
> int16_t block[12][64],
> }
>
> if(s->avctx->debug&FF_DEBUG_DCT_COEFF) {
> - /* save DCT coefficients */
> + /* print DCT coefficients */
> int i,j;
> - int16_t *dct = &s->current_picture.f.dct_coeff[mb_xy * 64 * 6];
> av_log(s->avctx, AV_LOG_DEBUG, "DCT coeffs of MB at %dx%d:\n",
> s->mb_x, s->mb_y);
> for(i=0; i<6; i++){
> for(j=0; j<64; j++){
> - *dct++ = block[i][s->dsp.idct_permutation[j]];
> - av_log(s->avctx, AV_LOG_DEBUG, "%5d", dct[-1]);
> + av_log(s->avctx, AV_LOG_DEBUG, "%5d",
> block[i][s->dsp.idct_permutation[j]]);
> }
> av_log(s->avctx, AV_LOG_DEBUG, "\n");
> }
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
