diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 14:27:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 14:27:54 +0100 |
| commit | dac87995295eeb45954b473f24e67ac7d103ba43 (patch) | |
| tree | 6d1df49645b1989aecdbc3aef8031b13858b806b | |
| parent | 32fdfdfbdac64c57b12910521af1379a24d01f73 (diff) | |
| parent | ddcca4ba074aa537c3059c76d69eb4ad6316bfe9 (diff) | |
| download | ffmpeg-dac87995295eeb45954b473f24e67ac7d103ba43.tar.gz | |
Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'
* commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9':
lavc: stop setting AVFrame.motion_subsample_log2
avserver: don't set deprecated options.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffserver.c | 8 | ||||
| -rw-r--r-- | libavcodec/error_resilience.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264.c | 1 | ||||
| -rw-r--r-- | libavcodec/svq3.c | 1 |
4 files changed, 0 insertions, 11 deletions
diff --git a/ffserver.c b/ffserver.c index eee83e5695..1a9f13c734 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 078dc9f336..da957d20ab 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 9dd4ceb352..aa63316e1c 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 4f5548fd8f..ac1d39f19d 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, |