Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 12:51:00 +0000 (14:51 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Oct 2013 12:51:00 +0000 (14:51 +0200)
commit8210e3846129c6be11322cefa85651bfcf85c257
tree0fdeabc28e7af671cbc89c2e6dfa38eb0e644d38
parentab16d5b7b56e66fefab75292d6a0e0f731a8966d
parent95587859cc69e5abe37c9e3af48008032d98e262
Merge commit '95587859cc69e5abe37c9e3af48008032d98e262' into HEAD

* commit '95587859cc69e5abe37c9e3af48008032d98e262':
  mpegvideo: Move obmc in a separate function

Conflicts:
libavcodec/mpegvideo_motion.c

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