--- ./src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc.orig 2025-06-03 13:06:38.000000000 -0500 +++ ./src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.cc 2025-08-23 12:56:31.995565831 -0500 @@ -286,22 +286,22 @@ static VideoCodecProfile ProfileIDToVideoCodecProfile(int profile) { // Clear out the CONSTRAINED & INTRA flags which are strict subsets of the // corresponding profiles with which they're used. - profile &= ~FF_PROFILE_H264_CONSTRAINED; - profile &= ~FF_PROFILE_H264_INTRA; + profile &= ~AV_PROFILE_H264_CONSTRAINED; + profile &= ~AV_PROFILE_H264_INTRA; switch (profile) { - case FF_PROFILE_H264_BASELINE: + case AV_PROFILE_H264_BASELINE: return H264PROFILE_BASELINE; - case FF_PROFILE_H264_MAIN: + case AV_PROFILE_H264_MAIN: return H264PROFILE_MAIN; - case FF_PROFILE_H264_EXTENDED: + case AV_PROFILE_H264_EXTENDED: return H264PROFILE_EXTENDED; - case FF_PROFILE_H264_HIGH: + case AV_PROFILE_H264_HIGH: return H264PROFILE_HIGH; - case FF_PROFILE_H264_HIGH_10: + case AV_PROFILE_H264_HIGH_10: return H264PROFILE_HIGH10PROFILE; - case FF_PROFILE_H264_HIGH_422: + case AV_PROFILE_H264_HIGH_422: return H264PROFILE_HIGH422PROFILE; - case FF_PROFILE_H264_HIGH_444_PREDICTIVE: + case AV_PROFILE_H264_HIGH_444_PREDICTIVE: return H264PROFILE_HIGH444PREDICTIVEPROFILE; default: DVLOG(1) << "Unknown profile id: " << profile; @@ -312,23 +312,23 @@ static int VideoCodecProfileToProfileID(VideoCodecProfile profile) { switch (profile) { case H264PROFILE_BASELINE: - return FF_PROFILE_H264_BASELINE; + return AV_PROFILE_H264_BASELINE; case H264PROFILE_MAIN: - return FF_PROFILE_H264_MAIN; + return AV_PROFILE_H264_MAIN; case H264PROFILE_EXTENDED: - return FF_PROFILE_H264_EXTENDED; + return AV_PROFILE_H264_EXTENDED; case H264PROFILE_HIGH: - return FF_PROFILE_H264_HIGH; + return AV_PROFILE_H264_HIGH; case H264PROFILE_HIGH10PROFILE: - return FF_PROFILE_H264_HIGH_10; + return AV_PROFILE_H264_HIGH_10; case H264PROFILE_HIGH422PROFILE: - return FF_PROFILE_H264_HIGH_422; + return AV_PROFILE_H264_HIGH_422; case H264PROFILE_HIGH444PREDICTIVEPROFILE: - return FF_PROFILE_H264_HIGH_444_PREDICTIVE; + return AV_PROFILE_H264_HIGH_444_PREDICTIVE; default: DVLOG(1) << "Unknown VideoCodecProfile: " << profile; } - return FF_PROFILE_UNKNOWN; + return AV_PROFILE_UNKNOWN; } SampleFormat AVSampleFormatToSampleFormat(AVSampleFormat sample_format, @@ -479,7 +479,7 @@ // TODO(dalecurtis): Just use the profile from the codec context if ffmpeg // ever starts supporting xHE-AAC. // FFmpeg provides the (defined_profile - 1) for AVCodecContext::profile - if (codec_context->profile == FF_PROFILE_UNKNOWN || + if (codec_context->profile == AV_PROFILE_UNKNOWN || codec_context->profile == mp4::AAC::kXHeAAcType - 1) { // Errors aren't fatal here, so just drop any MediaLog messages. NullMediaLog media_log; @@ -631,7 +631,7 @@ int hevc_profile = -1; // We need to parse extradata each time, because we won't add ffmpeg // hevc decoder & parser to chromium and codec_context->profile - // should always be FF_PROFILE_UNKNOWN (-99) here + // should always be AV_PROFILE_UNKNOWN (-99) here if (codec_context->extradata && codec_context->extradata_size) { mp4::HEVCDecoderConfigurationRecord hevc_config; if (hevc_config.Parse(codec_context->extradata, @@ -701,16 +701,16 @@ break; case VideoCodec::kVP9: switch (codec_context->profile) { - case FF_PROFILE_VP9_0: + case AV_PROFILE_VP9_0: profile = VP9PROFILE_PROFILE0; break; - case FF_PROFILE_VP9_1: + case AV_PROFILE_VP9_1: profile = VP9PROFILE_PROFILE1; break; - case FF_PROFILE_VP9_2: + case AV_PROFILE_VP9_2: profile = VP9PROFILE_PROFILE2; break; - case FF_PROFILE_VP9_3: + case AV_PROFILE_VP9_3: profile = VP9PROFILE_PROFILE3; break; default: