1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Michael Niedermayer 2ba4577809 Merge commit 'a8c104a511f97e4ea617df73b31737e28a8a5126'
* commit 'a8c104a511f97e4ea617df73b31737e28a8a5126':
  AVOption: add support for dictionary types.

Conflicts:
	libavutil/opt.c
	libavutil/opt.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-13 22:39:54 +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-08-04 13:33:44 +02:00
2014-07-08 02:11:19 +02:00
2014-05-28 03:52:50 +02:00
2013-08-29 22:52:04 +02:00
2014-07-17 11:29:01 +02:00