[FFmpeg-cvslog] vulkan: return VK_NOT_READY when no queries are available
ffmpeg | branch: release/6.1 | Lynne | Wed Oct 25 22:58:20 2023
+| [1a8e76698478006d97432f1eb972d37ef3549dbc] | committer: Lynne
vulkan: return VK_NOT_READY when no queries are available
Fixes a validation issue.
The issue is that the function gets called before we've sumitted a frame
for decoding to that context. However, we cannot run queries before
they've been reset, which happens at submission time.
As we'd need to otherwise run a command queue at init-time, just check
if submissions have happened.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a8e76698478006d97432f1eb972d37ef3549dbc
---
libavutil/vulkan.c | 5 +
libavutil/vulkan.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index dec8ccad64..bf8456b06d 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -456,6 +456,9 @@ VkResult ff_vk_exec_get_query(FFVulkanContext *s,
FFVkExecContext *e,
int64_t res = 0;
VkQueryResultFlags qf = 0;
+if (!e->had_submission)
+return VK_NOT_READY;
+
qf |= pool->query_64bit ?
VK_QUERY_RESULT_64_BIT : 0x0;
qf |= pool->query_statuses ?
@@ -779,6 +782,8 @@ int ff_vk_exec_submit(FFVulkanContext *s, FFVkExecContext
*e)
}
}
+e->had_submission = 1;
+
return 0;
}
diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
index 25c5ad4b74..b666841836 100644
--- a/libavutil/vulkan.h
+++ b/libavutil/vulkan.h
@@ -154,6 +154,7 @@ typedef struct FFVkExecContext {
uint32_t idx;
const struct FFVkExecPool *parent;
pthread_mutex_t lock;
+int had_submission;
/* Queue for the execution context */
VkQueue queue;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] [ffmpeg-web] branch master updated. 2b7ce01 web/download: add FFmpeg 2.8.22
The branch, master has been updated via 2b7ce01d0244d77829fdd59994a5d351e61a5057 (commit) via 78b5df38903e6dc040db65ba5a5d07bf398da6ef (commit) from 1e94f9d349ecf4b06d2a8710e28cb51a69852238 (commit) - Log - commit 2b7ce01d0244d77829fdd59994a5d351e61a5057 Author: Michael Niedermayer AuthorDate: Sun Oct 29 02:24:16 2023 +0200 Commit: Michael Niedermayer CommitDate: Sun Oct 29 02:24:16 2023 +0200 web/download: add FFmpeg 2.8.22 diff --git a/src/download b/src/download index 8c87d11..32f8338 100644 --- a/src/download +++ b/src/download @@ -559,10 +559,10 @@ libpostproc54. 7.100 - FFmpeg 2.8.21 "Feynman" + FFmpeg 2.8.22 "Feynman" -2.8.21 was released on 2022-10-30. It is the latest stable FFmpeg release +2.8.22 was released on 2023-10-29. It is the latest stable FFmpeg release from the 2.8 release branch, which was cut from master on 2015-09-05. Amongst lots of other changes, it includes all changes from ffmpeg-mt, libav master of 2015-08-28, libav 11 as of 2015-08-28. @@ -582,19 +582,19 @@ libpostproc53. 3.100 - Download xz tarball - PGP signature + Download xz tarball + PGP signature - Download bzip2 tarball - PGP signature + Download bzip2 tarball + PGP signature - Download gzip tarball - PGP signature + Download gzip tarball + PGP signature - https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n2.8.21;>Changelog + https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n2.8.22;>Changelog https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/2.8:/RELEASE_NOTES;>Release Notes commit 78b5df38903e6dc040db65ba5a5d07bf398da6ef Author: Michael Niedermayer AuthorDate: Fri Oct 20 17:58:19 2023 +0200 Commit: Michael Niedermayer CommitDate: Fri Oct 20 18:00:30 2023 +0200 web: move 5.0 to olddownloads our downstream list shows no maintained users of that release https://trac.ffmpeg.org/wiki/Downstreams Signed-off-by: Michael Niedermayer diff --git a/src/download b/src/download index a88f8cb..8c87d11 100644 --- a/src/download +++ b/src/download @@ -375,42 +375,6 @@ libpostproc56. 6.100 - FFmpeg 5.0.3 "Lorentz" - - -5.0.3 was released on 2023-04-02. It is the latest stable FFmpeg release -from the 5.0 release branch, which was cut from master on 2022-01-04. - - It includes the following library versions: - - -libavutil 57. 17.100 -libavcodec 59. 18.100 -libavformat59. 16.100 -libavdevice59. 4.100 -libavfilter 8. 24.100 -libswscale 6. 4.100 -libswresample 4. 3.100 -libpostproc56. 3.100 - - - Download xz tarball - PGP signature - - - Download bzip2 tarball - PGP signature - - - Download gzip tarball - PGP signature - - - https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.0.3;>Changelog - https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.0:/RELEASE_NOTES;>Release Notes - - - FFmpeg 4.4.4 "Rao" diff --git a/src/olddownload b/src/olddownload index 760711c..187848e 100644 --- a/src/olddownload +++ b/src/olddownload @@ -6,6 +6,42 @@ maintaining an old release. + FFmpeg 5.0.3 "Lorentz" + + +5.0.3 was released on 2023-04-02. It is the latest stable FFmpeg release +from the 5.0 release branch, which was cut from master on 2022-01-04. + + It includes the following library versions: + + +libavutil 57. 17.100 +libavcodec 59. 18.100 +libavformat59. 16.100 +libavdevice59. 4.100 +libavfilter 8. 24.100 +libswscale 6. 4.100 +libswresample 4. 3.100 +libpostproc56. 3.100 + + + Download xz tarball + PGP signature + + + Download bzip2 tarball + PGP signature + + + Download gzip tarball + PGP signature + + + https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n5.0.3;>Changelog + https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/5.0:/RELEASE_NOTES;>Release Notes + + + FFmpeg 4.0.6 "Wu" --- Summary of changes: src/download| 54 +- src/olddownload | 36 2 files changed, 45 insertions(+), 45 deletions(-) hooks/post-receive -- ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] Tag n2.8.22 : FFmpeg 2.8.22 release
[ffmpeg] [branch: refs/tags/n2.8.22] Tag:5792805c6fd25e6afc18ae6d0a0f9c08999cc99d > http://git.videolan.org/gitweb.cgi/ffmpeg.git?a=tag;h=5792805c6fd25e6afc18ae6d0a0f9c08999cc99d Tagger: Michael Niedermayer Date: Sun Oct 29 01:25:36 2023 +0200 FFmpeg 2.8.22 release ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/matroskadec: Fix declaration-after-statement warnings
ffmpeg | branch: release/2.8 | Andreas Rheinhardt
| Mon Oct 9 00:16:08 2023 +0200|
[25b3a5ef00605b37f34d49007f5c463bc6882687] | committer: Michael Niedermayer
avformat/matroskadec: Fix declaration-after-statement warnings
Reviewed-by: Michael Niedermayer
Signed-off-by: Andreas Rheinhardt
(cherry picked from commit 37b5f4a1f6a9c7c8f3620c6b1f7f2b0bb997e5d7)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25b3a5ef00605b37f34d49007f5c463bc6882687
---
libavformat/matroskadec.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 6c94601518..6126a24a8b 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -3347,14 +3347,13 @@ static int64_t
webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t
int64_t pre_bytes, pre_ns;
double pre_sec, prebuffer, bits_per_second;
CueDesc desc_beg = get_cue_desc(s, time_ns, cues_start);
+// Start with the first Cue.
+CueDesc desc_end = desc_beg;
if (time_ns > INT64_MAX - prebuffer_ns)
return -1;
prebuffered_ns = time_ns + prebuffer_ns;
-// Start with the first Cue.
-CueDesc desc_end = desc_beg;
-
// Figure out how much data we have downloaded for the prebuffer. This
will
// be used later to adjust the bits per sample to try.
while (desc_end.start_time_ns != -1 && desc_end.end_time_ns <
prebuffered_ns) {
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] Changelog: update
ffmpeg | branch: release/2.8 | Michael Niedermayer | Sun Oct 29 00:34:44 2023 +0200| [a7ec25b70436a4daeb349cc93bb3161f8317782a] | committer: Michael Niedermayer Changelog: update > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7ec25b70436a4daeb349cc93bb3161f8317782a --- Changelog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Changelog b/Changelog index 2c40352482..8db6e4b4fe 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,9 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. 2.8.22: + avformat/rtsp: Use rtsp_st->stream_index + avcodec/jpeg2000dec: Check image offset + Update for FFmpeg 2.8.22 avcodec/xvididct: Make c* unsigned to avoid undefined overflows avformat/tmv: Check video chunk size avformat/matroskadec: Check prebuffered_ns for overflow ___ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avformat/rtsp: Use rtsp_st->stream_index
ffmpeg | branch: release/2.8 | Michael Niedermayer |
Thu Oct 19 22:07:36 2023 +0200| [05c702a0cf5f68cde00cff83783e28d97550f487] |
committer: Michael Niedermayer
avformat/rtsp: Use rtsp_st->stream_index
Fixes: out of array access
Fixes: rtpdec_h264.c149/poc
Found-by: Hardik Shah of Vehere
Reviewed-by: Martin Storsjö
Signed-off-by: Michael Niedermayer
(cherry picked from commit e4d5ac8d7d2a08658b3db7dd821246fe6b35381f)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=05c702a0cf5f68cde00cff83783e28d97550f487
---
libavformat/rtsp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index 064e50e40f..746765da92 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -363,7 +363,7 @@ static void parse_fmtp(AVFormatContext *s, RTSPState *rt,
if (rtsp_st->sdp_payload_type == payload_type &&
rtsp_st->dynamic_handler &&
rtsp_st->dynamic_handler->parse_sdp_a_line) {
-rtsp_st->dynamic_handler->parse_sdp_a_line(s, i,
+rtsp_st->dynamic_handler->parse_sdp_a_line(s,
rtsp_st->stream_index,
rtsp_st->dynamic_protocol_context, line);
}
}
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avcodec/jpeg2000dec: Check image offset
ffmpeg | branch: release/2.8 | Michael Niedermayer |
Wed Oct 4 23:32:17 2023 +0200| [7ffdd2be6ae819c7cf31c39f6826afc39f16d666] |
committer: Michael Niedermayer
avcodec/jpeg2000dec: Check image offset
Fixes: left shift of negative value -538967841
Fixes:
62447/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-6427134337613824
Found-by: continuous fuzzing process
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Tomas Härdin
Signed-off-by: Michael Niedermayer
(cherry picked from commit 88453250dbe952e85899d04867914ef95785530e)
Signed-off-by: Michael Niedermayer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7ffdd2be6ae819c7cf31c39f6826afc39f16d666
---
libavcodec/jpeg2000dec.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index 8c93add6e5..140acb00cd 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -308,6 +308,11 @@ static int get_siz(Jpeg2000DecoderContext *s)
return AVERROR_INVALIDDATA;
}
+if (s->image_offset_x >= s->width || s->image_offset_y >= s->height) {
+av_log(s->avctx, AV_LOG_ERROR, "image offsets outside image");
+return AVERROR_INVALIDDATA;
+}
+
if (s->reduction_factor && (s->image_offset_x || s->image_offset_y) ){
av_log(s->avctx, AV_LOG_ERROR, "reduction factor with image offsets is
not fully implemented");
return AVERROR_PATCHWELCOME;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] New commits on branch release/6.0
URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07e3223dd0213cc5f0b65e98a6e1b1500d09ece0 Author: Michael Niedermayer Date: Thu Oct 19 22:07:36 2023 +0200 avformat/rtsp: Use rtsp_st->stream_index Fixes: out of array access Fixes: rtpdec_h264.c149/poc Found-by: Hardik Shah of Vehere Reviewed-by: Martin Storsjö Signed-off-by: Michael Niedermayer (cherry picked from commit e4d5ac8d7d2a08658b3db7dd821246fe6b35381f) Signed-off-by: Michael Niedermayer URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2269a892fb424eacfcba90039caeb19eeb4b79bb Author: Michael Niedermayer Date: Fri Oct 20 23:57:59 2023 +0200 avutil/tx_template: fix integer ovberflwo in fft3() Fixes: signed integer overflow: -1028966111 + -1314089526 cannot be represented in type 'int' Fixes: 63174/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_AAC_FIXED_fuzzer-5853273711837184 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Lynne Signed-off-by: Michael Niedermayer (cherry picked from commit 907743239d83f7bbcacc466af8ace4e0f6ebc257) Signed-off-by: Michael Niedermayer URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e770922e3056d8196bc7a7a1f5b4025fe52dbf9b Author: Michael Niedermayer Date: Wed Oct 4 23:32:17 2023 +0200 avcodec/jpeg2000dec: Check image offset Fixes: left shift of negative value -538967841 Fixes: 62447/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-6427134337613824 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Tomas Härdin Signed-off-by: Michael Niedermayer (cherry picked from commit 88453250dbe952e85899d04867914ef95785530e) Signed-off-by: Michael Niedermayer URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2577e16221fa724fc2bff77eb89d50aabeb7694 Author: Michael Niedermayer Date: Wed Oct 18 01:39:16 2023 +0200 avformat/mxfdec: Check klv offset Fixes: Assertion klv_offset >= mxf->run_in failed at libavformat/mxfdec.c:736 Fixes: 62936/clusterfuzz-testcase-minimized-ffmpeg_dem_MXF_fuzzer-5778404366221312.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Tomas Härdin Signed-off-by: Michael Niedermayer (cherry picked from commit 70f5fa63258f548cd8d067d479658bae61711ff4) Signed-off-by: Michael Niedermayer URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7b2b48078c1ce4315c4c366af06b9374c7db1c7b Author: Sean McGovern Date: Sat Oct 14 23:27:24 2023 -0400 libavutil/ppc/cpu.c: check that AT_HWCAP2 is defined It was not introduced until glibc 2.18. Signed-off-by: Michael Niedermayer (cherry picked from commit d799ad24045f2ae005c8b4c90bee5330ff15fea8) Signed-off-by: Michael Niedermayer URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b902f5113ed8b551e6c755b9f4f79f77f079699c Author: Michael Niedermayer Date: Sun Oct 1 19:28:55 2023 +0200 avcodec/h2645_parse: Avoid EAGAIN EAGAIN causes an assertion failure when it is returned from the decoder Fixes: Assertion consumed != (-(11)) failed at libavcodec/decode.c:462 Fixes: assertion_IOT_instruction_decode_c_462/poc Found-by: Hardik Shah of Vehere (Dawn Treaders team) Signed-off-by: Michael Niedermayer (cherry picked from commit 5ddab49d48343385eadb3a435a5491c476b66ecc) Signed-off-by: Michael Niedermayer URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1079565e8e1fe494c9c060b8be0a5e7ad183cd0e Author: Michael Niedermayer Date: Thu Oct 5 18:27:28 2023 +0200 avcodec/xvididct: Make c* unsigned to avoid undefined overflows Fixes: signed integer overflow: 1496950099 + 728014168 cannot be represented in type 'int' Fixes: 62667/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MJPEGB_fuzzer-6511785170305024 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry picked from commit f7e5537dc1ff2f45a6e4c98091f15e60c3647cfc) Signed-off-by: Michael Niedermayer URL: http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d25672afaf205858b11f1704305f7c64abc3818 Author: Michael Niedermayer Date: Thu Oct 5 14:17:05 2023 +0200 avcodec/bonk: Fix undefined overflow in predictor_calc_error() Fixes: signed integer overflow: -2146469728 - 1488954 cannot be represented in type 'int' Fixes: 62490/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BONK_fuzzer-5612782399389696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer (cherry
[FFmpeg-cvslog] vulkan: return VK_NOT_READY when no queries are available
ffmpeg | branch: master | Lynne | Wed Oct 25 22:58:20 2023
+| [1a8e76698478006d97432f1eb972d37ef3549dbc] | committer: Lynne
vulkan: return VK_NOT_READY when no queries are available
Fixes a validation issue.
The issue is that the function gets called before we've sumitted a frame
for decoding to that context. However, we cannot run queries before
they've been reset, which happens at submission time.
As we'd need to otherwise run a command queue at init-time, just check
if submissions have happened.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a8e76698478006d97432f1eb972d37ef3549dbc
---
libavutil/vulkan.c | 5 +
libavutil/vulkan.h | 1 +
2 files changed, 6 insertions(+)
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index dec8ccad64..bf8456b06d 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -456,6 +456,9 @@ VkResult ff_vk_exec_get_query(FFVulkanContext *s,
FFVkExecContext *e,
int64_t res = 0;
VkQueryResultFlags qf = 0;
+if (!e->had_submission)
+return VK_NOT_READY;
+
qf |= pool->query_64bit ?
VK_QUERY_RESULT_64_BIT : 0x0;
qf |= pool->query_statuses ?
@@ -779,6 +782,8 @@ int ff_vk_exec_submit(FFVulkanContext *s, FFVkExecContext
*e)
}
}
+e->had_submission = 1;
+
return 0;
}
diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
index 25c5ad4b74..b666841836 100644
--- a/libavutil/vulkan.h
+++ b/libavutil/vulkan.h
@@ -154,6 +154,7 @@ typedef struct FFVkExecContext {
uint32_t idx;
const struct FFVkExecPool *parent;
pthread_mutex_t lock;
+int had_submission;
/* Queue for the execution context */
VkQueue queue;
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-cvslog] avutil/channel_layout: simplify 22.2 layout bitmask define
ffmpeg | branch: master | James Almer | Sat Oct 28 12:47:13
2023 -0300| [1ad7bd0fe5f9eaaf8eb9d8ab99f19a2457e3aefe] | committer: James Almer
avutil/channel_layout: simplify 22.2 layout bitmask define
Signed-off-by: James Almer
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1ad7bd0fe5f9eaaf8eb9d8ab99f19a2457e3aefe
---
libavutil/channel_layout.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h
index a1765225c9..c9c404ef18 100644
--- a/libavutil/channel_layout.h
+++ b/libavutil/channel_layout.h
@@ -241,7 +241,7 @@ enum AVChannelOrder {
#define AV_CH_LAYOUT_7POINT1POINT4_BACK
(AV_CH_LAYOUT_7POINT1POINT2|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT)
#define AV_CH_LAYOUT_HEXADECAGONAL
(AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT)
#define AV_CH_LAYOUT_STEREO_DOWNMIX(AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT)
-#define AV_CH_LAYOUT_22POINT2
(AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_SIDE_LEFT|AV_CH_SIDE_RIGHT|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_RIGHT)
+#define AV_CH_LAYOUT_22POINT2
(AV_CH_LAYOUT_7POINT1POINT4_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER|AV_CH_BACK_CENTER|AV_CH_LOW_FREQUENCY_2|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_CENTER|AV_CH_TOP_SIDE_LEFT|AV_CH_TOP_SIDE_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_BOTTOM_FRONT_CENTER|AV_CH_BOTTOM_FRONT_LEFT|AV_CH_BOTTOM_FRONT_RIGHT)
#define AV_CH_LAYOUT_7POINT1_TOP_BACK AV_CH_LAYOUT_5POINT1POINT2_BACK
___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
