X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fwmv2.c;h=6542d31e9df582fee26a2a2435afc8a5878fe54c;hb=0372e73f917e72c40b09270f771046fc142be4a7;hp=7e0da935b54a113a819905d41d94682716bcac48;hpb=da0c8664b4dc906696803685f7e53ade68594ab8;p=ffmpeg diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index 7e0da935b54..6542d31e9df 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -20,10 +20,12 @@ #include "avcodec.h" #include "idctdsp.h" +#include "mpegutils.h" #include "mpegvideo.h" #include "msmpeg4data.h" #include "simple_idct.h" #include "wmv2.h" +#include "wmv2data.h" av_cold void ff_wmv2_common_init(Wmv2Context *w) @@ -88,7 +90,7 @@ void ff_wmv2_add_mb(MpegEncContext *s, int16_t block1[6][64], wmv2_add_block(w, block1[2], dest_y + 8 * s->linesize, s->linesize, 2); wmv2_add_block(w, block1[3], dest_y + 8 + 8 * s->linesize, s->linesize, 3); - if (s->avctx->flags & CODEC_FLAG_GRAY) + if (s->avctx->flags & AV_CODEC_FLAG_GRAY) return; wmv2_add_block(w, block1[4], dest_cb, s->uvlinesize, 4); @@ -140,7 +142,7 @@ void ff_mspel_motion(MpegEncContext *s, uint8_t *dest_y, w->wdsp.put_mspel_pixels_tab[dxy](dest_y + 8 * linesize, ptr + 8 * linesize, linesize); w->wdsp.put_mspel_pixels_tab[dxy](dest_y + 8 + 8 * linesize, ptr + 8 + 8 * linesize, linesize); - if (s->avctx->flags & CODEC_FLAG_GRAY) + if (s->avctx->flags & AV_CODEC_FLAG_GRAY) return; if (s->out_format == FMT_H263) {