Revert "avformat/dashenc: Disable writing CODECS tag for HEVC streams"
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>
This commit is contained in:
		
							parent
							
								
									b27ae2c0b7
								
							
						
					
					
						commit
						812f39ee85
					
				@ -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 {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user