Merge commit 'd082078a88da3b3e926197d0d2aa9fa322123b76'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:41:03 +0000 (15:41 +0000)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Mon, 29 Feb 2016 15:41:03 +0000 (15:41 +0000)
* commit 'd082078a88da3b3e926197d0d2aa9fa322123b76':
  dashenc: eliminate ffurl_* usage

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
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;
          }