@@ -1892,17 +1892,17 @@ const OptionDef options[] = {

         "set the limit file size in bytes", "limit_size" },

     { "ss",             HAS_ARG | OPT_TIME | OPT_OFFSET,             { .off = OFFSET(start_time) },

         "set the start time offset", "time_off" },

-    { "itsoffset",      HAS_ARG | OPT_TIME | OPT_OFFSET,             { .off = OFFSET(input_ts_offset) },

+    { "itsoffset",      HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_EXPERT,{ .off = OFFSET(input_ts_offset) },

         "set the input ts offset", "time_off" },

-    { "itsscale",       HAS_ARG | OPT_DOUBLE | OPT_SPEC,             { .off = OFFSET(ts_scale) },

+    { "itsscale",       HAS_ARG | OPT_DOUBLE | OPT_SPEC | OPT_EXPERT,{ .off = OFFSET(ts_scale) },

         "set the input ts scale", "scale" },

     { "metadata",       HAS_ARG | OPT_STRING | OPT_SPEC,             { .off = OFFSET(metadata) },

         "add metadata", "string=string" },

-    { "dframes",        HAS_ARG | OPT_FUNC2,                         { .func2_arg = opt_data_frames },

+    { "dframes",        HAS_ARG | OPT_FUNC2 | OPT_EXPERT,            { .func2_arg = opt_data_frames },

         "set the number of data frames to record", "number" },

     { "benchmark",      OPT_BOOL | OPT_EXPERT,                       { &do_benchmark },

         "add timings for benchmarking" },

-    { "timelimit",      HAS_ARG,                                     { .func_arg = opt_timelimit },

+    { "timelimit",      HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_timelimit },

         "set max runtime in seconds", "limit" },

     { "dump",           OPT_BOOL | OPT_EXPERT,                       { &do_pkt_dump },

         "dump each input packet" },

@@ -1927,13 +1927,13 @@ const OptionDef options[] = {

         "finish encoding within shortest input" },

     { "dts_delta_threshold", HAS_ARG | OPT_FLOAT | OPT_EXPERT,       { &dts_delta_threshold },

         "timestamp discontinuity delta threshold", "threshold" },

-    { "xerror",         OPT_BOOL,                                    { &exit_on_error },

+    { "xerror",         OPT_BOOL | OPT_EXPERT,                       { &exit_on_error },

         "exit on error", "error" },

     { "copyinkf",       OPT_BOOL | OPT_EXPERT | OPT_SPEC,            { .off = OFFSET(copy_initial_nonkeyframes) },

         "copy initial non-keyframes" },

     { "frames",         OPT_INT64 | HAS_ARG | OPT_SPEC,              { .off = OFFSET(max_frames) },

         "set the number of frames to record", "number" },

-    { "tag",            OPT_STRING | HAS_ARG | OPT_SPEC,             { .off = OFFSET(codec_tags) },

+    { "tag",            OPT_STRING | HAS_ARG | OPT_SPEC | OPT_EXPERT,{ .off = OFFSET(codec_tags) },

         "force codec tag/fourcc", "fourcc/tag" },

     { "q",              HAS_ARG | OPT_EXPERT | OPT_DOUBLE | OPT_SPEC,{ .off = OFFSET(qscale) },

         "use fixed quality scale (VBR)", "q" },

@@ -1945,9 +1945,9 @@ const OptionDef options[] = {

         "create a complex filtergraph", "graph_description" },

     { "stats",          OPT_BOOL,                                    { &print_stats },

         "print progress report during encoding", },

-    { "attach",         HAS_ARG | OPT_FUNC2,                         { .func2_arg = opt_attach },

+    { "attach",         HAS_ARG | OPT_FUNC2 | OPT_EXPERT,            { .func2_arg = opt_attach },

         "add an attachment to the output file", "filename" },

-    { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC,            { .off = OFFSET(dump_attachment) },

+    { "dump_attachment", HAS_ARG | OPT_STRING | OPT_SPEC |OPT_EXPERT,{ .off = OFFSET(dump_attachment) },

         "extract an attachment into a file", "filename" },

     { "cpuflags",       HAS_ARG | OPT_EXPERT,                        { .func_arg = opt_cpuflags },

         "set CPU flags mask", "mask" },

@@ -1971,11 +1971,11 @@ const OptionDef options[] = {

         "rate control override for specific intervals", "override" },

     { "vcodec",       OPT_VIDEO | HAS_ARG  | OPT_FUNC2,                          { .func2_arg = opt_video_codec },

         "force video codec ('copy' to copy stream)", "codec" },

-    { "same_quant",   OPT_VIDEO | OPT_BOOL ,                                     { &same_quant },

+    { "same_quant",   OPT_VIDEO | OPT_BOOL | OPT_EXPERT,                         { &same_quant },

         "use same quantizer as source (implies VBR)" },

     { "pass",         OPT_VIDEO | HAS_ARG ,                                      { opt_pass },

         "select the pass number (1 or 2)", "n" },

-    { "passlogfile",  OPT_VIDEO | HAS_ARG | OPT_STRING ,                         { &pass_logfilename_prefix },

+    { "passlogfile",  OPT_VIDEO | HAS_ARG | OPT_STRING | OPT_EXPERT,             { &pass_logfilename_prefix },

         "select two pass log file name prefix", "prefix" },

     { "deinterlace",  OPT_VIDEO | OPT_EXPERT ,                                   { .func_arg = opt_deinterlace },

         "this option is deprecated, use the yadif filter instead" },

@@ -2045,11 +2045,11 @@ const OptionDef options[] = {

     { "muxpreload", OPT_FLOAT | HAS_ARG | OPT_EXPERT | OPT_OFFSET, { .off = OFFSET(mux_preload) },

         "set the initial demux-decode delay", "seconds" },

-    { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC, { .off = OFFSET(bitstream_filters) },

+    { "bsf", HAS_ARG | OPT_STRING | OPT_SPEC | OPT_EXPERT, { .off = OFFSET(bitstream_filters) },

         "A comma-separated list of bitstream filters", "bitstream_filters" },

     /* data codec support */

-    { "dcodec", HAS_ARG | OPT_DATA | OPT_FUNC2, { .func2_arg = opt_data_codec },

+    { "dcodec", HAS_ARG | OPT_DATA | OPT_FUNC2 | OPT_EXPERT, { .func2_arg = opt_data_codec },

         "force data codec ('copy' to copy stream)", "codec" },

     { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, { .func_arg = opt_default },