mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-03-27 16:32:15 +01:00
eb36267ead
Nothing in community depends on it anymore and we're actively trying to get rid of it, so demote it to testing where a few packages (5 at the time of writing) are still using it.
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
--- qtwebengine-5.15.17-lts.orig/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter.cc
|
|
+++ qtwebengine-5.15.17-lts/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter.cc
|
|
@@ -63,17 +63,17 @@
|
|
hdr[1] |= 1;
|
|
|
|
switch (audio_profile) {
|
|
- case FF_PROFILE_AAC_MAIN:
|
|
+ case AV_PROFILE_AAC_MAIN:
|
|
break;
|
|
- case FF_PROFILE_AAC_HE:
|
|
- case FF_PROFILE_AAC_HE_V2:
|
|
- case FF_PROFILE_AAC_LOW:
|
|
+ case AV_PROFILE_AAC_HE:
|
|
+ case AV_PROFILE_AAC_HE_V2:
|
|
+ case AV_PROFILE_AAC_LOW:
|
|
hdr[2] |= (1 << 6);
|
|
break;
|
|
- case FF_PROFILE_AAC_SSR:
|
|
+ case AV_PROFILE_AAC_SSR:
|
|
hdr[2] |= (2 << 6);
|
|
break;
|
|
- case FF_PROFILE_AAC_LTP:
|
|
+ case AV_PROFILE_AAC_LTP:
|
|
hdr[2] |= (3 << 6);
|
|
break;
|
|
default:
|
|
--- qtwebengine-5.15.17-lts.orig/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
|
|
+++ qtwebengine-5.15.17-lts/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
|
|
@@ -28,7 +28,7 @@
|
|
// Set up reasonable aac parameters
|
|
memset(&test_parameters_, 0, sizeof(AVCodecParameters));
|
|
test_parameters_.codec_id = AV_CODEC_ID_AAC;
|
|
- test_parameters_.profile = FF_PROFILE_AAC_MAIN;
|
|
+ test_parameters_.profile = AV_PROFILE_AAC_MAIN;
|
|
test_parameters_.ch_layout.nb_channels = 2;
|
|
test_parameters_.extradata = extradata_header_;
|
|
test_parameters_.extradata_size = sizeof(extradata_header_);
|
|
@@ -114,7 +114,7 @@
|
|
|
|
EXPECT_EQ(profile, kAacMainProfile);
|
|
|
|
- test_parameters_.profile = FF_PROFILE_AAC_HE;
|
|
+ test_parameters_.profile = AV_PROFILE_AAC_HE;
|
|
FFmpegAACBitstreamConverter converter_he(&test_parameters_);
|
|
|
|
test_packet.reset(new AVPacket());
|
|
@@ -127,7 +127,7 @@
|
|
|
|
EXPECT_EQ(profile, kAacLowComplexityProfile);
|
|
|
|
- test_parameters_.profile = FF_PROFILE_AAC_ELD;
|
|
+ test_parameters_.profile = AV_PROFILE_AAC_ELD;
|
|
FFmpegAACBitstreamConverter converter_eld(&test_parameters_);
|
|
|
|
test_packet.reset(new AVPacket());
|