Skip to content

Commit

Permalink
left-over fixes from #2644
Browse files Browse the repository at this point in the history
  • Loading branch information
jeanlf committed Dec 7, 2023
1 parent 78d0955 commit 4891483
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/Makefile
Expand Up @@ -404,7 +404,7 @@ DEPS := $(SRCS:%.c=.deps/%.dep)
-include .depend

.depend: $(DEPS)
cat $^ > "$@"
@cat $^ > "$@"

.deps/%.dep: %.c
@mkdir -p $(dir $@)
Expand Down
6 changes: 1 addition & 5 deletions src/filters/dasher.c
Expand Up @@ -5240,11 +5240,7 @@ static GF_Err dasher_write_and_send_manifest(GF_DasherCtx *ctx, u64 last_period_
ctx->mpd->force_llhls_mode = 0;

char *opath = ctx->explicit_mode ? gf_file_basename(ctx->out_path) : ctx->out_path;
if (m3u8_second_pass) {
e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, opath, gf_list_last(ctx->mpd->periods), mode);
} else {
e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, opath, gf_list_last(ctx->mpd->periods), mode);
}
e = gf_mpd_write_m3u8_master_playlist(ctx->mpd, tmp, opath, gf_list_last(ctx->mpd->periods), mode);
} else {
e = gf_mpd_write(ctx->mpd, tmp, ctx->cmpd);
}
Expand Down

0 comments on commit 4891483

Please sign in to comment.