[FFmpeg-cvslog] Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'
Michael Niedermayer
git at videolan.org
Tue Jul 29 20:31:29 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul 29 20:09:15 2014 +0200| [31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f] | committer: Michael Niedermayer
Merge commit '69e7336b8e16ee65226fc20381baf537f4b125e6'
* commit '69e7336b8e16ee65226fc20381baf537f4b125e6':
avstring: Expose the simple name match function
Conflicts:
libavutil/avstring.c
libavutil/avstring.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=31e0b5d3cb40acd960b6f6c711557a82dc2d6c5f
---
More information about the ffmpeg-cvslog
mailing list