Michael Niedermayer 31e0b5d3cb 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@gmx.at>

2014-07-29 20:24:42 +02:00

12 KiB

Raw Blame History

View Raw