Message ID | 20210607063205.180031-1-val.zapod.vz@gmail.com |
---|---|
State | Accepted |
Commit | 812f39ee85ac27a7e11a374150e60a4614f060b1 |
Headers | show |
Series | [FFmpeg-devel,v2] Revert "avformat/dashenc: Disable writing CODECS tag for HEVC streams" | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
> > >On 6/7/21, 12:01 PM, "Valerii Zapodovnikov" <val.zapod.vz@gmail.com> wrote: > >This reverts commit d6d407d2d758b404af0ce6a8ff46bf164db020a1. >Hack not needed after a2b1dd0ce301450a47c972745a6b33c4c273aa5d. >Will fix #7480 and #8904. >This will include e.g. CODECS="hvc1.2.4.L123.B0" into m3u8. Pushed. Thanks, Karthick > >Signed-off-by: Valerii Zapodovnikov <val.zapod.vz@gmail.com> >--- > libavformat/dashenc.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > >diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c >index 810ab22416..8a626c15a4 100644 >--- a/libavformat/dashenc.c >+++ b/libavformat/dashenc.c >@@ -1312,7 +1312,6 @@ static int write_manifest(AVFormatContext *s, int final) > AVStream *st = s->streams[i]; > OutputStream *os = &c->streams[i]; > char *agroup = NULL; >- char *codec_str_ptr = NULL; > int stream_bitrate = os->muxer_overhead; > if (os->bit_rate > 0) > stream_bitrate += os->bit_rate; >@@ -1331,13 +1330,10 @@ static int write_manifest(AVFormatContext *s, int final) > av_strlcat(codec_str, ",", sizeof(codec_str)); > av_strlcat(codec_str, audio_codec_str, sizeof(codec_str)); > } >- if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) { >- codec_str_ptr = codec_str; >- } > get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); > ff_hls_write_stream_info(st, c->m3u8_out, stream_bitrate, > playlist_file, agroup, >- codec_str_ptr, NULL, NULL); >+ codec_str, NULL, NULL); > } > > } else { >-- >2.30.2 > >_______________________________________________ >ffmpeg-devel mailing list >ffmpeg-devel@ffmpeg.org > >To unsubscribe, visit link above, or email >ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 810ab22416..8a626c15a4 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1312,7 +1312,6 @@ static int write_manifest(AVFormatContext *s, int final) AVStream *st = s->streams[i]; OutputStream *os = &c->streams[i]; char *agroup = NULL; - char *codec_str_ptr = NULL; int stream_bitrate = os->muxer_overhead; if (os->bit_rate > 0) stream_bitrate += os->bit_rate; @@ -1331,13 +1330,10 @@ static int write_manifest(AVFormatContext *s, int final) av_strlcat(codec_str, ",", sizeof(codec_str)); av_strlcat(codec_str, audio_codec_str, sizeof(codec_str)); } - if (st->codecpar->codec_id != AV_CODEC_ID_HEVC) { - codec_str_ptr = codec_str; - } get_hls_playlist_name(playlist_file, sizeof(playlist_file), NULL, i); ff_hls_write_stream_info(st, c->m3u8_out, stream_bitrate, playlist_file, agroup, - codec_str_ptr, NULL, NULL); + codec_str, NULL, NULL); } } else {
This reverts commit d6d407d2d758b404af0ce6a8ff46bf164db020a1. Hack not needed after a2b1dd0ce301450a47c972745a6b33c4c273aa5d. Will fix #7480 and #8904. This will include e.g. CODECS="hvc1.2.4.L123.B0" into m3u8. Signed-off-by: Valerii Zapodovnikov <val.zapod.vz@gmail.com> --- libavformat/dashenc.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)