From: Michael Niedermayer <michaelni@gmx.at>
Date: Thu, 6 Nov 2014 16:14:18 +0000 (+0100)
Subject: Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'
X-Git-Tag: n2.6-dev~595
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/5241f900581480030e2f2ac47010f86f7ee4f9fd?hp=5241f900581480030e2f2ac47010f86f7ee4f9fd

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>
---