repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.2~trusty
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
hdsenc.c
diff --git
a/ffmpeg/libavformat/hdsenc.c
b/ffmpeg/libavformat/hdsenc.c
index 1f77785f95236724ae5d4afe1aa9c5b8b1d612a1..a161b642c97d48156f13a7582716bb35094f59e4 100644
(file)
--- a/
ffmpeg/libavformat/hdsenc.c
+++ b/
ffmpeg/libavformat/hdsenc.c
@@
-145,15
+145,15
@@
static void hds_free(AVFormatContext *s)
if (os->ctx && os->ctx_inited)
av_write_trailer(os->ctx);
if (os->ctx && os->ctx->pb)
if (os->ctx && os->ctx_inited)
av_write_trailer(os->ctx);
if (os->ctx && os->ctx->pb)
- av_free
(
os->ctx->pb);
+ av_free
p(&
os->ctx->pb);
if (os->ctx)
avformat_free_context(os->ctx);
if (os->ctx)
avformat_free_context(os->ctx);
- av_free
(
os->metadata);
+ av_free
p(&
os->metadata);
for (j = 0; j < os->nb_extra_packets; j++)
for (j = 0; j < os->nb_extra_packets; j++)
- av_free
(
os->extra_packets[j]);
+ av_free
p(&
os->extra_packets[j]);
for (j = 0; j < os->nb_fragments; j++)
for (j = 0; j < os->nb_fragments; j++)
- av_free
(
os->fragments[j]);
- av_free
(
os->fragments);
+ av_free
p(&
os->fragments[j]);
+ av_free
p(&
os->fragments);
}
av_freep(&c->streams);
}
}
av_freep(&c->streams);
}
@@
-174,7
+174,7
@@
static int write_manifest(AVFormatContext *s, int final)
ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE,
&s->interrupt_callback, NULL);
if (ret < 0) {
ret = avio_open2(&out, temp_filename, AVIO_FLAG_WRITE,
&s->interrupt_callback, NULL);
if (ret < 0) {
- av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n", filename);
+ av_log(s, AV_LOG_ERROR, "Unable to open %s for writing\n",
temp_
filename);
return ret;
}
avio_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
return ret;
}
avio_printf(out, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n");
@@
-204,11
+204,7
@@
static int write_manifest(AVFormatContext *s, int final)
avio_printf(out, "</manifest>\n");
avio_flush(out);
avio_close(out);
avio_printf(out, "</manifest>\n");
avio_flush(out);
avio_close(out);
- if (rename(temp_filename, filename) == -1) {
- av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n", temp_filename, filename);
- return AVERROR(errno);
- }
- return 0;
+ return ff_rename(temp_filename, filename, s);
}
static void update_size(AVIOContext *out, int64_t pos)
}
static void update_size(AVIOContext *out, int64_t pos)
@@
-289,11
+285,7
@@
static int write_abst(AVFormatContext *s, OutputStream *os, int final)
update_size(out, afrt_pos);
update_size(out, 0);
avio_close(out);
update_size(out, afrt_pos);
update_size(out, 0);
avio_close(out);
- if (rename(temp_filename, filename) == -1) {
- av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n", temp_filename, filename);
- return AVERROR(errno);
- }
- return 0;
+ return ff_rename(temp_filename, filename, s);
}
static int init_file(AVFormatContext *s, OutputStream *os, int64_t start_ts)
}
static int init_file(AVFormatContext *s, OutputStream *os, int64_t start_ts)
@@
-330,8
+322,8
@@
static int hds_write_header(AVFormatContext *s)
AVOutputFormat *oformat;
if (mkdir(s->filename, 0777) == -1 && errno != EEXIST) {
AVOutputFormat *oformat;
if (mkdir(s->filename, 0777) == -1 && errno != EEXIST) {
- av_log(s, AV_LOG_ERROR , "Failed to create directory %s\n", s->filename);
ret = AVERROR(errno);
ret = AVERROR(errno);
+ av_log(s, AV_LOG_ERROR , "Failed to create directory %s\n", s->filename);
goto fail;
}
goto fail;
}
@@
-404,7
+396,9
@@
static int hds_write_header(AVFormatContext *s)
goto fail;
}
avcodec_copy_context(st->codec, s->streams[i]->codec);
goto fail;
}
avcodec_copy_context(st->codec, s->streams[i]->codec);
+ st->codec->codec_tag = 0;
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
st->sample_aspect_ratio = s->streams[i]->sample_aspect_ratio;
+ st->time_base = s->streams[i]->time_base;
}
if (c->streams[c->nb_streams].ctx)
c->nb_streams++;
}
if (c->streams[c->nb_streams].ctx)
c->nb_streams++;
@@
-487,10
+481,9
@@
static int hds_flush(AVFormatContext *s, OutputStream *os, int final,
snprintf(target_filename, sizeof(target_filename),
"%s/stream%dSeg1-Frag%d", s->filename, index, os->fragment_index);
snprintf(target_filename, sizeof(target_filename),
"%s/stream%dSeg1-Frag%d", s->filename, index, os->fragment_index);
- if (rename(os->temp_filename, target_filename) == -1) {
- av_log(s, AV_LOG_ERROR, "failed to rename file %s to %s\n", os->temp_filename, target_filename);
- return AVERROR(errno);
- }
+ ret = ff_rename(os->temp_filename, target_filename, s);
+ if (ret < 0)
+ return ret;
add_fragment(os, target_filename, os->frag_start_ts, end_ts - os->frag_start_ts);
if (!final) {
add_fragment(os, target_filename, os->frag_start_ts, end_ts - os->frag_start_ts);
if (!final) {
@@
-506,7
+499,7
@@
static int hds_flush(AVFormatContext *s, OutputStream *os, int final,
if (remove > 0) {
for (i = 0; i < remove; i++) {
unlink(os->fragments[i]->file);
if (remove > 0) {
for (i = 0; i < remove; i++) {
unlink(os->fragments[i]->file);
- av_free
(
os->fragments[i]);
+ av_free
p(&
os->fragments[i]);
}
os->nb_fragments -= remove;
memmove(os->fragments, os->fragments + remove,
}
os->nb_fragments -= remove;
memmove(os->fragments, os->fragments + remove,