Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / h263.h

diff --git a/libavcodec/h263.h b/libavcodec/h263.h
index ed9da5352b57d8e70061a1a2bb1b29a155bebcbb..91dd548108ed34a6729b546d945ed397ba5756c8 100644 (file)
--- a/libavcodec/h263.h
+++ b/libavcodec/h263.h
@@ -148,7 +148,7 @@ static inline int get_p_cbp(MpegEncContext * s,
                       int motion_x, int motion_y){
     int cbp, i;
 
-    if(s->flags & CODEC_FLAG_CBP_RD){
+    if (s->mpv_flags & FF_MPV_FLAG_CBP_RD) {
         int best_cbpy_score= INT_MAX;
         int best_cbpc_score= INT_MAX;
         int cbpc = (-1), cbpy= (-1);