Merge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Mar 2013 01:08:58 +0000 (02:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Mar 2013 01:10:43 +0000 (02:10 +0100)
commit4a62f477ea846ee1198c8945237147d00b4f9c3d
treee377ae85f65a8b3a88cf26f7ccc24ce4d8444187
parente53061154f42cda93052a2f558e1c4697e3b0c1a
parent6e7b50b4270116ded8b874d76cb7c5b1a0341827
Merge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827'

* commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827':
  mpegvideo_enc: drop support for reusing the input motion vectors.

Conflicts:
libavcodec/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/motion_est.c
libavcodec/mpegvideo_enc.c