[FFmpeg-cvslog] [ffmpeg] branch master updated. 9b94b652db doc/examples/decode_filter_video: use av_usleep
ffmpeg-git at ffmpeg.org
ffmpeg-git at ffmpeg.org
Mon Aug 11 22:30:33 EEST 2025
The branch, master has been updated
via 9b94b652db857da290e7a3da67eaa1d23c28f65c (commit)
via 5a768e8dd0949b12e28b49948dbfbf7387594bfc (commit)
via 1a1377c53decf1264ca255910124caae82fd63a0 (commit)
via 48b941d54335cd8314df3773b4a98fe2c46efd38 (commit)
via 082e2b26d4efd7cc7638a9d80a52861d4e4116db (commit)
via 01cfb01c9c719b7b5e29ce8e1fbb92ae29e3d811 (commit)
via eec391993e447aaa9b8da38c5daaa4c31849d10f (commit)
via a6380c35d6ffc2c1ddd5ddd61c82ead4caa40ab7 (commit)
via b7a3c426ea118de9c3b6314408d4d37a562239a6 (commit)
via ac6db22e372460f3462d16eacdf9b7611cc3c0af (commit)
via 98c4b9dbbd2b39b834ec1e0618b0a63f691cdf65 (commit)
via 0798f58abeddef358612db8c84674ba3380f9291 (commit)
from 2287a19abbd80d25b411a3028969c55c4b0b8c88 (commit)
- Log -----------------------------------------------------------------
commit 9b94b652db857da290e7a3da67eaa1d23c28f65c
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Mon Aug 11 20:25:43 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
doc/examples/decode_filter_video: use av_usleep
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/doc/examples/decode_filter_video.c b/doc/examples/decode_filter_video.c
index aacc91c2f7..62ada4bca7 100644
--- a/doc/examples/decode_filter_video.c
+++ b/doc/examples/decode_filter_video.c
@@ -27,8 +27,6 @@
* @example decode_filter_video.c
*/
-#define _XOPEN_SOURCE 600 /* for usleep */
-#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
@@ -38,6 +36,7 @@
#include <libavfilter/buffersrc.h>
#include <libavutil/mem.h>
#include <libavutil/opt.h>
+#include <libavutil/time.h>
const char *filter_descr = "scale=78:24,transpose=cclock";
/* other way:
@@ -195,7 +194,7 @@ static void display_frame(const AVFrame *frame, AVRational time_base)
delay = av_rescale_q(frame->pts - last_pts,
time_base, AV_TIME_BASE_Q);
if (delay > 0 && delay < 1000000)
- usleep(delay);
+ av_usleep(delay);
}
last_pts = frame->pts;
}
commit 5a768e8dd0949b12e28b49948dbfbf7387594bfc
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Mon Aug 11 20:25:20 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
doc/examples/decode_filter_audio: remove unused unistd.h include
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/doc/examples/decode_filter_audio.c b/doc/examples/decode_filter_audio.c
index 03e13ef66f..67c8a14aab 100644
--- a/doc/examples/decode_filter_audio.c
+++ b/doc/examples/decode_filter_audio.c
@@ -30,8 +30,6 @@
* file to be played with ffplay.
*/
-#include <unistd.h>
-
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libavfilter/buffersink.h>
commit 1a1377c53decf1264ca255910124caae82fd63a0
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sat Aug 9 05:38:20 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
avfilter/stack_internal: fix checkheaders test
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/libavfilter/stack_internal.h b/libavfilter/stack_internal.h
index ace8886152..b4f9b92223 100644
--- a/libavfilter/stack_internal.h
+++ b/libavfilter/stack_internal.h
@@ -19,6 +19,10 @@
#ifndef AVFILTER_STACK_INTERNAL_H
#define AVFILTER_STACK_INTERNAL_H
+#ifdef HWContext
+
+#include "libavfilter/framesync.h"
+
enum {
STACK_H = 0,
STACK_V = 1,
@@ -57,4 +61,6 @@ static int stack_init(AVFilterContext *avctx);
static av_cold void stack_uninit(AVFilterContext *avctx);
static int stack_activate(AVFilterContext *avctx);
+#endif
+
#endif /* AVFILTER_STACK_INTERNAL_H */
commit 48b941d54335cd8314df3773b4a98fe2c46efd38
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sat Aug 9 04:01:56 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
tools/fourcc2pixfmt: fix getopt return value type
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/tools/fourcc2pixfmt.c b/tools/fourcc2pixfmt.c
index abea0c8d84..519cc1cad0 100644
--- a/tools/fourcc2pixfmt.c
+++ b/tools/fourcc2pixfmt.c
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
int i, list_fourcc_pix_fmt = 0, list_pix_fmt_fourccs = 0;
const PixelFormatTag *pix_fmt_tags = raw_pix_fmt_tags;
const char *pix_fmt_name = NULL;
- char c;
+ int c;
if (argc == 1) {
usage();
commit 082e2b26d4efd7cc7638a9d80a52861d4e4116db
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sat Aug 9 04:01:40 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
tools/graph2dot: fix getopt return value type
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/tools/graph2dot.c b/tools/graph2dot.c
index d96bfd8126..72b98f0957 100644
--- a/tools/graph2dot.c
+++ b/tools/graph2dot.c
@@ -113,7 +113,7 @@ int main(int argc, char **argv)
FILE *infile = NULL;
char *graph_string = NULL;
AVFilterGraph *graph = NULL;
- char c;
+ int c;
av_log_set_level(AV_LOG_DEBUG);
commit 01cfb01c9c719b7b5e29ce8e1fbb92ae29e3d811
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sat Aug 9 03:19:48 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
avutil/tests/pca: comment out unused code
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/libavutil/tests/pca.c b/libavutil/tests/pca.c
index 2d9eb8f56a..b2afbea3b5 100644
--- a/libavutil/tests/pca.c
+++ b/libavutil/tests/pca.c
@@ -40,14 +40,14 @@ int main(void){
for(i=0; i<9000000; i++){
double v[2*LEN+100];
- double sum=0;
+// double sum=0;
int pos = av_lfg_get(&prng) % LEN;
int v2 = av_lfg_get(&prng) % 101 - 50;
v[0] = av_lfg_get(&prng) % 101 - 50;
for(j=1; j<8; j++){
if(j<=pos) v[j]= v[0];
else v[j]= v2;
- sum += v[j];
+// sum += v[j];
}
/* for(j=0; j<LEN; j++){
v[j] -= v[pos];
commit eec391993e447aaa9b8da38c5daaa4c31849d10f
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sat Aug 9 02:48:35 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
avcodec/prores_raw: add missing includes
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/libavcodec/prores_raw.h b/libavcodec/prores_raw.h
index 9f370303d4..3ac8068dd5 100644
--- a/libavcodec/prores_raw.h
+++ b/libavcodec/prores_raw.h
@@ -22,7 +22,9 @@
#ifndef AVCODEC_PRORES_RAW_H
#define AVCODEC_PRORES_RAW_H
+#include "libavutil/frame.h"
#include "libavutil/mem_internal.h"
+#include "libavutil/pixfmt.h"
#include "bytestream.h"
#include "blockdsp.h"
commit a6380c35d6ffc2c1ddd5ddd61c82ead4caa40ab7
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sat Aug 9 02:47:21 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
avfilter/vf_blackdetect: add missing config.h include
For ARCH_X86.
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/libavfilter/vf_blackdetect.h b/libavfilter/vf_blackdetect.h
index 838a0355df..48350568a9 100644
--- a/libavfilter/vf_blackdetect.h
+++ b/libavfilter/vf_blackdetect.h
@@ -22,6 +22,8 @@
#include <stddef.h>
#include <stdint.h>
+#include "config.h"
+
typedef unsigned (*ff_blackdetect_fn)(const uint8_t *src, ptrdiff_t stride,
ptrdiff_t width, ptrdiff_t height,
unsigned threshold);
commit b7a3c426ea118de9c3b6314408d4d37a562239a6
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sat Aug 9 00:43:50 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
avcodec/vulkan_encode_av1: use CODEC_PIXFMTS to define pix_fmts
Fixes deprecation warnings.
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/libavcodec/vulkan_encode_av1.c b/libavcodec/vulkan_encode_av1.c
index d8a1097158..840092cf6d 100644
--- a/libavcodec/vulkan_encode_av1.c
+++ b/libavcodec/vulkan_encode_av1.c
@@ -1394,10 +1394,7 @@ const FFCodec ff_av1_vulkan_encoder = {
AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vulkan_encode_av1_defaults,
- .p.pix_fmts = (const enum AVPixelFormat[]) {
- AV_PIX_FMT_VULKAN,
- AV_PIX_FMT_NONE,
- },
+ CODEC_PIXFMTS(AV_PIX_FMT_VULKAN),
.hw_configs = ff_vulkan_encode_hw_configs,
.p.wrapper_name = "vulkan",
};
commit ac6db22e372460f3462d16eacdf9b7611cc3c0af
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sun Aug 3 16:46:10 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
avcodec/d3d12va_encode: fix label followed by a declaration warning
Fixes: d3d12va_encode.c: warning: label followed by a declaration is a
C23 extension
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/libavcodec/d3d12va_encode.c b/libavcodec/d3d12va_encode.c
index 880002ce55..1ecaee3b6d 100644
--- a/libavcodec/d3d12va_encode.c
+++ b/libavcodec/d3d12va_encode.c
@@ -973,8 +973,7 @@ rc_mode_found:
case RC_MODE_CQP:
// cqp ConfigParams will be updated in ctx->codec->configure.
break;
-
- case RC_MODE_CBR:
+ case RC_MODE_CBR: {
D3D12_VIDEO_ENCODER_RATE_CONTROL_CBR *cbr_ctl;
ctx->rc.ConfigParams.DataSize = sizeof(D3D12_VIDEO_ENCODER_RATE_CONTROL_CBR);
@@ -995,8 +994,8 @@ rc_mode_found:
ctx->rc.ConfigParams.pConfiguration_CBR = cbr_ctl;
break;
-
- case RC_MODE_VBR:
+ }
+ case RC_MODE_VBR: {
D3D12_VIDEO_ENCODER_RATE_CONTROL_VBR *vbr_ctl;
ctx->rc.ConfigParams.DataSize = sizeof(D3D12_VIDEO_ENCODER_RATE_CONTROL_VBR);
@@ -1018,8 +1017,8 @@ rc_mode_found:
ctx->rc.ConfigParams.pConfiguration_VBR = vbr_ctl;
break;
-
- case RC_MODE_QVBR:
+ }
+ case RC_MODE_QVBR: {
D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBR *qvbr_ctl;
ctx->rc.ConfigParams.DataSize = sizeof(D3D12_VIDEO_ENCODER_RATE_CONTROL_QVBR);
@@ -1039,7 +1038,7 @@ rc_mode_found:
ctx->rc.ConfigParams.pConfiguration_QVBR = qvbr_ctl;
break;
-
+ }
default:
break;
}
commit 98c4b9dbbd2b39b834ec1e0618b0a63f691cdf65
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sun Aug 3 16:04:37 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
swscale/input: don't generate unused functions
Fixes: input.c:1271:1: warning: unused function 'planar_rgb16_s12_to_a'
Fixes: input.c:1272:1: warning: unused function 'planar_rgb16_s10_to_a'
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/libswscale/input.c b/libswscale/input.c
index 32a0214ddf..eb4eb3101e 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -1212,7 +1212,7 @@ static void planar_rgb_to_uv(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *src[
#define rdpx(src) \
(is_be ? AV_RB16(src) : AV_RL16(src))
-#define shifted_planar_rgb16(rdpx_shift) \
+#define shifted_planar_rgb16_to_y(rdpx_shift) \
static av_always_inline void planar_rgb16_s ## rdpx_shift ## _to_y(uint8_t *_dst, const uint8_t *_src[4], \
int width, int bpc, int is_be, int32_t *rgb2yuv) \
{ \
@@ -1229,8 +1229,9 @@ static void planar_rgb_to_uv(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *src[
dst[i] = (ry*r + gy*g + by*b + (16 << (RGB2YUV_SHIFT + bpc - 8)) \
+ (1 << (RGB2YUV_SHIFT + shift - 15))) >> (RGB2YUV_SHIFT + shift - 14); \
} \
- } \
- \
+ }
+
+#define shifted_planar_rgb16_to_a(rdpx_shift) \
static av_always_inline void planar_rgb16_s ## rdpx_shift ## _to_a(uint8_t *_dst, const uint8_t *_src[4], \
int width, int bpc, int is_be, int32_t *rgb2yuv) \
{ \
@@ -1243,7 +1244,8 @@ static void planar_rgb_to_uv(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *src[
dst[i] = rdpx(src[3] + i) << (14 - shift); \
} \
} \
- \
+
+#define shifted_planar_rgb16_to_uv(rdpx_shift) \
static av_always_inline void planar_rgb16_s ## rdpx_shift ## _to_uv(uint8_t *_dstU, uint8_t *_dstV, \
const uint8_t *_src[4], int width, \
int bpc, int is_be, int32_t *rgb2yuv) \
@@ -1267,9 +1269,17 @@ static void planar_rgb_to_uv(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *src[
} \
}
+#define shifted_planar_rgb16_to_y_uv(rdpx_shift) \
+ shifted_planar_rgb16_to_y(rdpx_shift) \
+ shifted_planar_rgb16_to_uv(rdpx_shift)
+
+#define shifted_planar_rgb16(rdpx_shift) \
+ shifted_planar_rgb16_to_y_uv(rdpx_shift) \
+ shifted_planar_rgb16_to_a(rdpx_shift)
+
shifted_planar_rgb16(16)
-shifted_planar_rgb16(12)
-shifted_planar_rgb16(10)
+shifted_planar_rgb16_to_y_uv(12)
+shifted_planar_rgb16_to_y_uv(10)
#undef rdpx
commit 0798f58abeddef358612db8c84674ba3380f9291
Author: Kacper Michajłow <kasper93 at gmail.com>
AuthorDate: Sun Aug 3 15:45:32 2025 +0200
Commit: Kacper Michajłow <kasper93 at gmail.com>
CommitDate: Mon Aug 11 19:29:53 2025 +0000
avcodec/mpeg4videodec: add av_unreachable for unexpected startcode
Fixes: mpeg4videodec.c:3679:22: warning: variable 'name' is used
uninitialized whenever 'if' condition is false
Signed-off-by: Kacper Michajłow <kasper93 at gmail.com>
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index bc2c92672a..f3d138387b 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -3678,6 +3678,8 @@ int ff_mpeg4_parse_picture_header(Mpeg4DecContext *ctx, GetBitContext *gb,
name = "Reserved";
else if (startcode <= 0x1FF)
name = "System start";
+ else
+ av_unreachable("Unexpected startcode");
av_log(s->avctx, AV_LOG_DEBUG, "startcode: %3X %s at %d\n",
startcode, name, get_bits_count(gb));
}
-----------------------------------------------------------------------
Summary of changes:
doc/examples/decode_filter_audio.c | 2 --
doc/examples/decode_filter_video.c | 5 ++---
libavcodec/d3d12va_encode.c | 13 ++++++-------
libavcodec/mpeg4videodec.c | 2 ++
libavcodec/prores_raw.h | 2 ++
libavcodec/vulkan_encode_av1.c | 5 +----
libavfilter/stack_internal.h | 6 ++++++
libavfilter/vf_blackdetect.h | 2 ++
libavutil/tests/pca.c | 4 ++--
libswscale/input.c | 22 ++++++++++++++++------
tools/fourcc2pixfmt.c | 2 +-
tools/graph2dot.c | 2 +-
12 files changed, 41 insertions(+), 26 deletions(-)
hooks/post-receive
--
More information about the ffmpeg-cvslog
mailing list