From: Steven Liu <lingjiujianke@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] Del has_video for HLS_INDEPENDENT_SEGMENTS, it can be used with audio
Date: Mon, 5 Dec 2022 10:21:20 +0800
Message-ID: <CADxeRwmyA8+5bP_P8WA61JCw81cOYoT7_cYT5ueCKfHyef_YLQ@mail.gmail.com> (raw)
In-Reply-To: <A546C307-4E89-4550-9738-28A99FFB2EAD@gmail.com>
Xavier Laffargue <laffargue.xavier@gmail.com> 于2022年12月4日周日 02:38写道:
>
> Signed-off-by: Xavier Laffargue <laffargue.xavier@gmail.com>
> ---
> libavformat/hlsenc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
> index a86fc8907f..92276084aa 100644
> --- a/libavformat/hlsenc.c
> +++ b/libavformat/hlsenc.c
> @@ -1598,7 +1598,7 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs)
> avio_printf(byterange_mode ? hls->m3u8_out : vs->out, "#EXT-X-DISCONTINUITY\n");
> vs->discontinuity_set = 1;
> }
> - if (vs->has_video && (hls->flags & HLS_INDEPENDENT_SEGMENTS)) {
> + if (hls->flags & HLS_INDEPENDENT_SEGMENTS) {
> avio_printf(byterange_mode ? hls->m3u8_out : vs->out, "#EXT-X-INDEPENDENT-SEGMENTS\n");
> }
> for (en = vs->segments; en; en = en->next) {
> --
> 2.31.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Hi Xavier,
I cannot apply this patch, it will output message:
Applying: Del has_video for HLS_INDEPENDENT_SEGMENTS, it can be used with audio
error: patch failed: libavformat/hlsenc.c:1598
error: libavformat/hlsenc.c: patch does not apply
Patch failed at 0001 Del has_video for HLS_INDEPENDENT_SEGMENTS, it
can be used with audio
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
BTW, the subject title should lead as avformat/hlsenc:
Thanks
Steven
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
prev parent reply other threads:[~2022-12-05 2:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-03 18:38 Xavier Laffargue
2022-12-05 2:21 ` Steven Liu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CADxeRwmyA8+5bP_P8WA61JCw81cOYoT7_cYT5ueCKfHyef_YLQ@mail.gmail.com \
--to=lingjiujianke@gmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git