[FFmpeg-cvslog] Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'
Michael Niedermayer
git at videolan.org
Mon Mar 17 06:23:10 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 06:16:18 2014 +0100| [bb3c0571d31a2aef2556050127b7b5f99298b237] | committer: Michael Niedermayer
Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'
* commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c':
h264: Replace mpegvideo-specific MAX_THREADS by private define
Conflicts:
libavcodec/h264.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb3c0571d31a2aef2556050127b7b5f99298b237
---
More information about the ffmpeg-cvslog
mailing list