Message ID | abe4571410fa4ef3947119d5064dea3e@mx.toyon.corp |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel] lavc/cbs_sei: Fix H.264/5 SEI unit ordering | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
andriy/make_aarch64_jetson | success | Make finished |
andriy/make_fate_aarch64_jetson | success | Make fate finished |
andriy/make_armv7_RPi4 | success | Make finished |
andriy/make_fate_armv7_RPi4 | success | Make fate finished |
diff --git a/libavcodec/cbs_sei.c b/libavcodec/cbs_sei.c index 141e97ec58..4a4a58957b 100644 --- a/libavcodec/cbs_sei.c +++ b/libavcodec/cbs_sei.c @@ -154,14 +154,14 @@ static int cbs_sei_get_unit(CodedBitstreamContext *ctx, if (prefix) { // ... before the first VCL NAL unit. for (i = 0; i < au->nb_units; i++) { - if (au->units[i].type < highest_vcl_type) + if (au->units[i].type <= highest_vcl_type) break; } position = i; } else { // ... after the last VCL NAL unit. for (i = au->nb_units - 1; i >= 0; i--) { - if (au->units[i].type < highest_vcl_type) + if (au->units[i].type <= highest_vcl_type) break; } if (i < 0) {
Fixes regression from commit 8843607f495c95c1e67a3ce3d6f15dca6e252439 causing incorrect SEI unit ordering (e.g. after H264_NAL_IDR_SLICE when prefix is specified). Signed-off-by: Jon Waltman <jwaltman@toyon.com> --- libavcodec/cbs_sei.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.25.1