* commit 'efcde917':
  vorbiscomment: simplify API by using av_dict_count()

Conflicts:
	libavformat/flacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>