* commit 'ddcca4ba':
  lavc: stop setting AVFrame.motion_subsample_log2
  avserver: don't set deprecated options.
Merged-by: Michael Niedermayer <michaelni@gmx.at>