[FFmpeg-cvslog] Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 12 14:27:45 2013 +0100| [dac87995295eeb45954b473f24e67ac7d103ba43] | committer: Michael Niedermayer

Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'

* commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9':
  lavc: stop setting AVFrame.motion_subsample_log2
  avserver: don't set deprecated options.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dac87995295eeb45954b473f24e67ac7d103ba43
---