ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Mar 1
00:06:42 2015 +0100| [7fce8c752d87ca4738179bb7e9238bae67abdeac] | committer:
Michael Niedermayer
Merge commit '71f1ad37d858b810b71a4af1c25771beaa50b27b'
* commit '71f1ad37d858b810b71a4af1c25771beaa50b27b':
lavc: do not compile fmtconvert unconditionally
Conflicts:
configure
libavcodec/ppc/Makefile
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7fce8c752d87ca4738179bb7e9238bae67abdeac
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
