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 /libavcodec/svq3.c | |
| 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>
Diffstat (limited to 'libavcodec/svq3.c')
| -rw-r--r-- | libavcodec/svq3.c | 1 |
1 files changed, 0 insertions, 1 deletions
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, |