diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 21:14:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 22:10:35 +0200 |
| commit | 94d68a41fabb55dd8c7e59b88fe4a28a637d1e5f (patch) | |
| tree | 0fc97aeec123c1e0eb3166aa34e6da9680831d14 /libavcodec/vc1dec.c | |
| parent | 4a2836eaf33b64512678ed6dc1387f8f042cf387 (diff) | |
| parent | 7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615 (diff) | |
Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'
* commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615':
lavc: AV-prefix all codec flags
Conflicts:
doc/examples/muxing.c
ffmpeg.c
ffmpeg_opt.c
ffplay.c
libavcodec/aacdec.c
libavcodec/aacenc.c
libavcodec/ac3dec.c
libavcodec/ac3enc_float.c
libavcodec/atrac1.c
libavcodec/atrac3.c
libavcodec/atrac3plusdec.c
libavcodec/dcadec.c
libavcodec/ffv1enc.c
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb.c
libavcodec/imc.c
libavcodec/libmp3lame.c
libavcodec/libtheoraenc.c
libavcodec/libtwolame.c
libavcodec/libvpxenc.c
libavcodec/libxavs.c
libavcodec/libxvid.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegaudiodec_template.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/nellymoserdec.c
libavcodec/nellymoserenc.c
libavcodec/nvenc.c
libavcodec/on2avc.c
libavcodec/options_table.h
libavcodec/opus_celt.c
libavcodec/pngenc.c
libavcodec/ra288.c
libavcodec/ratecontrol.c
libavcodec/twinvq.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
libavcodec/vorbisdec.c
libavcodec/vp3.c
libavcodec/wma.c
libavcodec/wmaprodec.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/me_cmp_init.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index d7a0cefa4d..3045ccf0d8 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -191,7 +191,7 @@ static void vc1_draw_sprites(VC1Context *v, SpriteData* sd) } alpha = av_clip_uint16(sd->coefs[1][6]); - for (plane = 0; plane < (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY ? 1 : 3); plane++) { + for (plane = 0; plane < (CONFIG_GRAY && s->avctx->flags & AV_CODEC_FLAG_GRAY ? 1 : 3); plane++) { int width = v->output_width>>!!plane; for (row = 0; row < v->output_height>>!!plane; row++) { @@ -312,7 +312,7 @@ static void vc1_sprite_flush(AVCodecContext *avctx) wrong but it looks better than doing nothing. */ if (f && f->data[0]) - for (plane = 0; plane < (CONFIG_GRAY && s->avctx->flags & CODEC_FLAG_GRAY ? 1 : 3); plane++) + for (plane = 0; plane < (CONFIG_GRAY && s->avctx->flags & AV_CODEC_FLAG_GRAY ? 1 : 3); plane++) for (i = 0; i < v->sprite_height>>!!plane; i++) memset(f->data[plane] + i * f->linesize[plane], plane ? 128 : 0, f->linesize[plane]); @@ -428,7 +428,7 @@ static av_cold int vc1_decode_init(AVCodecContext *avctx) if (!avctx->extradata_size || !avctx->extradata) return -1; - if (!CONFIG_GRAY || !(avctx->flags & CODEC_FLAG_GRAY)) + if (!CONFIG_GRAY || !(avctx->flags & AV_CODEC_FLAG_GRAY)) avctx->pix_fmt = ff_get_format(avctx, avctx->codec->pix_fmts); else { avctx->pix_fmt = AV_PIX_FMT_GRAY8; @@ -630,7 +630,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, v->second_field = 0; - if(s->avctx->flags & CODEC_FLAG_LOW_DELAY) + if(s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY) s->low_delay = 1; /* no supplementary picture */ |