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/error_resilience.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/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 1 |
1 files changed, 0 insertions, 1 deletions
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) { |