Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 16:14:18 +0000 (17:14 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 6 Nov 2014 16:14:38 +0000 (17:14 +0100)
commit5241f900581480030e2f2ac47010f86f7ee4f9fd
tree3d51f845ae4024782640748e539962e0cf41f6dd
parentd70e503ebcd4c1979e05fe4548b227a2c1ba67b0
parente0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118
Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'

* commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118':
  mpegvideo_enc: rework direct mode check

Conflicts:
libavcodec/mpegvideo_enc.c

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