sync AVCodecContext again

diff --git a/cap_lavc.c b/cap_lavc.c
index b84f3fcd57afe457d22cbcac7e36d1643c2c4f77..0f9482b7358560f9bb27e937d478de63c7601952 100644 (file)
--- a/cap_lavc.c
+++ b/cap_lavc.c
@@ -319,7 +319,9 @@ typedef struct AVCodecContext {
        int width, height;
        int gop_size;
        enum PixelFormat pix_fmt;
+#if LIBAVCODEC_VERSION_MAJOR < 53
        int rate_emu;
+#endif
        void (*draw_horiz_band)(struct AVCodecContext *s, const AVFrame *src, int offset[4], int y, int type, int height);
        int sample_rate;
        int channels;
@@ -339,7 +341,9 @@ typedef struct AVCodecContext {
        float b_quant_factor;
        int rc_strategy;
        int b_frame_strategy;
+#if LIBAVCODEC_VERSION_MAJOR < 53
        int hurry_up;
+#endif
        struct AVCodec *codec;
        void *priv_data;
        int rtp_payload_size;
@@ -403,8 +407,10 @@ typedef struct AVCodecContext {
        int debug;
        int debug_mv;
        uint64_t error[4];
+#if LIBAVCODEC_VERSION_MAJOR < 53
        int mb_qmin;
        int mb_qmax;
+#endif
        int me_cmp;
        int me_sub_cmp;
        int mb_cmp;
@@ -1335,9 +1341,6 @@ void SCR_CaptureVideo_Lavc_BeginVideo(void)
                                return;
                        }
 
-                       if (video_str->codec->global_quality != 0)
-                               video_str->codec->flags |= CODEC_FLAG_QSCALE;
-
                        format->vpts = 0;
                        format->bufsize = max(format->bufsize, (size_t) (cls.capturevideo.width * cls.capturevideo.height * 6 + 200));
                        format->bufsize = max(format->bufsize, sizeof(AVPicture));