| Message ID | A546C307-4E89-4550-9738-28A99FFB2EAD@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] Del has_video for HLS_INDEPENDENT_SEGMENTS, it can be used with audio | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/configure_loongarch64 | warning | Failed to apply patch |
| andriy/configure_x86 | warning | Failed to apply patch |
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
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) {
Signed-off-by: Xavier Laffargue <laffargue.xavier@gmail.com> --- libavformat/hlsenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)