diff mbox series

[FFmpeg-devel] Revert "avformat/dashenc: Disable writing CODECS tag for HEVC streams"

Message ID 20210605150109.5929-1-val.zapod.vz@gmail.com
State Superseded
Headers show
Series [FFmpeg-devel] Revert "avformat/dashenc: Disable writing CODECS tag for HEVC streams" | expand

Checks

Context Check Description
andriy/configure warning Failed to apply patch

Commit Message

Valerii Zapodovnikov June 5, 2021, 3:01 p.m. UTC 
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(-)
diff mbox series

Patch

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index ebbdfd627c..b0fb408f0d 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -1309,7 +1309,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;
@@ -1328,13 +1327,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);
         }
         dashenc_io_close(s, &c->m3u8_out, temp_filename);
         if (use_rename)