* commit 'd58dd4b5':
  avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member

Conflicts:
	libavcodec/libvpxenc.c
	libavcodec/options_table.h
	libavfilter/vf_drawtext.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>