1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
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
..
2014-07-20 02:01:50 +02:00
2014-07-20 23:58:36 +02:00
2014-06-03 10:58:19 -08:00
2014-05-23 23:30:21 +02:00
2014-07-08 02:11:19 +02:00
2014-05-28 03:52:50 +02:00
2014-07-20 23:58:36 +02:00
2014-07-17 11:29:01 +02:00