FFmpeg/libavformat
Michael Niedermayer dff4aa6afd Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'
* commit 'efcde917af407a6031ecff68edd51fce7b83d104':
  vorbiscomment: simplify API by using av_dict_count()

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-28 13:08:50 +02:00
..
2013-10-13 20:13:38 +00:00
2013-10-18 19:53:47 +02:00
2013-12-25 17:14:32 +01:00
2014-05-17 20:13:33 +02:00
2013-10-06 19:36:53 +02:00
2014-05-20 00:00:45 +02:00
2013-10-13 20:13:38 +00:00
2014-04-27 14:50:14 +02:00
2014-01-16 00:38:27 +01:00
2014-05-20 00:00:45 +02:00
2014-04-16 19:41:41 +02:00
2014-04-16 19:41:41 +02:00
2013-12-25 17:38:29 +01:00
2014-04-01 01:13:09 +02:00
2014-04-14 21:40:59 +02:00
2014-04-05 02:18:09 +02:00
2014-04-22 20:44:31 +02:00
2013-12-23 16:28:44 +01:00
2014-03-11 13:22:49 +01:00
2013-12-25 17:38:29 +01:00
2014-05-07 23:39:47 +02:00
2014-05-17 20:13:33 +02:00
2013-11-13 22:56:18 +01:00
2013-12-25 17:38:29 +01:00
2014-04-27 15:14:32 +02:00
2014-04-20 20:56:02 +02:00
2013-10-13 20:13:38 +00:00
2013-12-25 17:38:29 +01:00
2013-12-25 17:38:30 +01:00
2014-04-23 15:10:42 +02:00
2014-03-04 22:54:13 +01:00
2014-05-17 20:13:33 +02:00
2013-10-13 20:13:38 +00:00
2014-03-08 12:36:57 +01:00
2014-05-07 23:39:47 +02:00
2013-10-13 20:13:38 +00:00
2013-08-21 05:51:41 +02:00
2014-04-15 13:51:48 +02:00