Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 13:27:45 +0000 (14:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 12 Mar 2013 13:27:54 +0000 (14:27 +0100)
commitdac87995295eeb45954b473f24e67ac7d103ba43
tree6d1df49645b1989aecdbc3aef8031b13858b806b
parent32fdfdfbdac64c57b12910521af1379a24d01f73
parentddcca4ba074aa537c3059c76d69eb4ad6316bfe9
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>
ffserver.c
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/svq3.c