diff --git a/ffserver.c b/ffserver.c
index eee83e5695c904bbd6eab7d3cbafc5afb1ce3116..1a9f13c734d190720707e512483208ac21465388 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -4545,14 +4545,6 @@ static int parse_ffconfig(const char *filename)
                     ERROR("VideoQMin out of range\n");
                 }
             }
-        } else if (!av_strcasecmp(cmd, "LumaElim")) {
-            get_arg(arg, sizeof(arg), &p);
-            if (stream)
-                video_enc.luma_elim_threshold = atoi(arg);
-        } else if (!av_strcasecmp(cmd, "ChromaElim")) {
-            get_arg(arg, sizeof(arg), &p);
-            if (stream)
-                video_enc.chroma_elim_threshold = atoi(arg);
         } else if (!av_strcasecmp(cmd, "LumiMask")) {
             get_arg(arg, sizeof(arg), &p);
             if (stream)
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index 078dc9f3368d64a78ea8ac71ebcb085351a45b44..da957d20abeaeff055edcb830db22dc09acf2ce4 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -895,7 +895,6 @@ void ff_er_frame_end(ERContext *s)
             }
             return;
         }
-        s->cur_pic->f.motion_subsample_log2 = 3;
     }
 
     if (s->avctx->debug & FF_DEBUG_ER) {
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 9dd4ceb3526b36f68978a94d5065854a5bb575f6..aa63316e1cf5d6466543f334e99ef912884ed803 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -385,7 +385,6 @@ static int alloc_picture(H264Context *h, Picture *pic)
         pic->motion_val[i] = (int16_t (*)[2])pic->motion_val_buf[i]->data + 4;
         pic->ref_index[i]  = pic->ref_index_buf[i]->data;
     }
-    pic->f.motion_subsample_log2 = 2;
 
     return 0;
 fail:
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 4f5548fd8f6bd2cd73dffd0d8b8169746bdb4f47..ac1d39f19df0511eb1120ea1525f36ff53e6af98 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -1063,7 +1063,6 @@ static int get_buffer(AVCodecContext *avctx, Picture *pic)
             pic->ref_index[i]  = pic->ref_index_buf[i]->data;
         }
     }
-    pic->f.motion_subsample_log2 = 2;
     pic->reference = !(h->pict_type == AV_PICTURE_TYPE_B);
 
     ret = ff_get_buffer(avctx, &pic->f,