Merge commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92'

* commit '1920382aa9f21d7ed1a3c2214990da8d2b067a92':
  dashenc: add option to provide UTC timing source

Also use E instead of AV_OPT_FLAG_ENCODING_PARAM to be consistent with
the other AVOption.

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc libavformat/dashenc.c
index 40430f8b6b58b47b147d53616e96b588b4aa96db,198932caa4f4720bc350e2ba39aa97e923c958cb..5b279418529471ed1f0df25152496a98e1f8ed89
--- 1/libavformat/dashenc.c
--- 2/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@@ -96,8 -94,7 +96,9 @@@ typedef struct DASHContext 
      const char *single_file_name;
      const char *init_seg_name;
      const char *media_seg_name;
 +    AVRational min_frame_rate, max_frame_rate;
 +    int ambiguous_frame_rate;
+     const char *utc_timing_url;
  } DASHContext;
  
  static int dash_write(void *opaque, uint8_t *buf, int buf_size)
@@@ -1063,6 -985,7 +1067,7 @@@ static const AVOption options[] = 
      { "single_file_name", "DASH-templated name to be used for baseURL. Implies storing all segments in one file, accessed using byte ranges", OFFSET(single_file_name), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, E },
      { "init_seg_name", "DASH-templated name to used for the initialization segment", OFFSET(init_seg_name), AV_OPT_TYPE_STRING, {.str = "init-stream$RepresentationID$.m4s"}, 0, 0, E },
      { "media_seg_name", "DASH-templated name to used for the media segments", OFFSET(media_seg_name), AV_OPT_TYPE_STRING, {.str = "chunk-stream$RepresentationID$-$Number%05d$.m4s"}, 0, 0, E },
 -    { "utc_timing_url", "URL of the page that will return the UTC timestamp in ISO format", OFFSET(utc_timing_url), AV_OPT_TYPE_STRING, { 0 }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
++    { "utc_timing_url", "URL of the page that will return the UTC timestamp in ISO format", OFFSET(utc_timing_url), AV_OPT_TYPE_STRING, { 0 }, 0, 0, E },
      { NULL },
  };