Merge commit 'd082078a88da3b3e926197d0d2aa9fa322123b76'

* commit 'd082078a88da3b3e926197d0d2aa9fa322123b76':
  dashenc: eliminate ffurl_* usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

diff --cc libavformat/dashenc.c
index fbccbd16aa67ee9637ff1e769f2e90d01fe4503c,8c75d189b0df1d801f86b616a282ac6d9f50056d..931d32d14528c885e50c5c242b63e73714313974
--- 1/libavformat/dashenc.c
--- 2/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@@ -857,9 -825,8 +854,8 @@@ static int dash_flush(AVFormatContext *
          if (c->single_file) {
              find_index_range(s, full_path, start_pos, &index_length);
          } else {
-             ffurl_close(os->out);
-             os->out = NULL;
+             ff_format_io_close(s, &os->out);
 -            ret = ff_rename(temp_path, full_path);
 +            ret = avpriv_io_move(temp_path, full_path);
              if (ret < 0)
                  break;
          }