[FFmpeg-cvslog] Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'
Michael Niedermayer
git at videolan.org
Thu Nov 6 17:19:47 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 6 17:14:18 2014 +0100| [5241f900581480030e2f2ac47010f86f7ee4f9fd] | committer: Michael Niedermayer
Merge commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118'
* commit 'e0a1d0a2b04eb5220d00fc7ce46a57cc5e3c7118':
mpegvideo_enc: rework direct mode check
Conflicts:
libavcodec/mpegvideo_enc.c
See: ad985671986464015f3136ad6882ef232c19fc22
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5241f900581480030e2f2ac47010f86f7ee4f9fd
---
More information about the ffmpeg-cvslog
mailing list