diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:12:51 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-22 21:24:41 +0300 |
commit | d9b264bc73723ce538d72f28a4a8fb4f85af7eca (patch) | |
tree | 7a2f93dbd9adf87534c29c932ed157941a2c4af6 /libavcodec/wmv2.c | |
parent | 337aa17e61091500b95d6127c9ffd65d9086decb (diff) | |
parent | 848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42 (diff) |
Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'
* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
mpegvideo: Drop flags and flags2
Conflicts:
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/ratecontrol.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.c')
-rw-r--r-- | libavcodec/wmv2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index d102f361c9..1cfb7eb0e4 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -88,7 +88,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->flags & CODEC_FLAG_GRAY) + if (s->avctx->flags & CODEC_FLAG_GRAY) return; wmv2_add_block(w, block1[4], dest_cb, s->uvlinesize, 4); @@ -140,7 +140,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->flags & CODEC_FLAG_GRAY) + if (s->avctx->flags & CODEC_FLAG_GRAY) return; dxy = 0; |