diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-04-14 14:59:32 +0200 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:13 -0300 |
| commit | ef6a9e5e311f09fa8032974fa4d0c1e166a959bb (patch) | |
| tree | b9b1893c45771cde9f36853685a5bc8a6b5cf27c /libavfilter | |
| parent | 985c0dac674846721ec8ff23344c16ac7d1c9a1e (diff) | |
| download | ffmpeg-ef6a9e5e311f09fa8032974fa4d0c1e166a959bb.tar.gz | |
avutil/buffer: Switch AVBuffer API to size_t
Announced in 14040a1d913794d9a3fd6406a6d8c2f0e37e0062.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_ashowinfo.c | 3 | ||||
| -rw-r--r-- | libavfilter/framepool.c | 4 | ||||
| -rw-r--r-- | libavfilter/framepool.h | 4 | ||||
| -rw-r--r-- | libavfilter/vf_showinfo.c | 10 |
4 files changed, 12 insertions, 9 deletions
diff --git a/libavfilter/af_ashowinfo.c b/libavfilter/af_ashowinfo.c index 9046e8d84a..e817ecea37 100644 --- a/libavfilter/af_ashowinfo.c +++ b/libavfilter/af_ashowinfo.c @@ -170,7 +170,8 @@ static void dump_audio_service_type(AVFilterContext *ctx, AVFrameSideData *sd) static void dump_unknown(AVFilterContext *ctx, AVFrameSideData *sd) { - av_log(ctx, AV_LOG_INFO, "unknown side data type: %d, size %d bytes", sd->type, sd->size); + av_log(ctx, AV_LOG_INFO, "unknown side data type: %d, size " + "%"SIZE_SPECIFIER" bytes", sd->type, sd->size); } static int filter_frame(AVFilterLink *inlink, AVFrame *buf) diff --git a/libavfilter/framepool.c b/libavfilter/framepool.c index 5f67fa170a..9123403c40 100644 --- a/libavfilter/framepool.c +++ b/libavfilter/framepool.c @@ -48,7 +48,7 @@ struct FFFramePool { }; -FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size), +FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size), int width, int height, enum AVPixelFormat format, @@ -115,7 +115,7 @@ fail: return NULL; } -FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(buffer_size_t size), +FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(size_t size), int channels, int nb_samples, enum AVSampleFormat format, diff --git a/libavfilter/framepool.h b/libavfilter/framepool.h index 28857a4a16..daab88e4a5 100644 --- a/libavfilter/framepool.h +++ b/libavfilter/framepool.h @@ -44,7 +44,7 @@ typedef struct FFFramePool FFFramePool; * @param align buffers alignement of each frame in this pool * @return newly created video frame pool on success, NULL on error. */ -FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size), +FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size), int width, int height, enum AVPixelFormat format, @@ -62,7 +62,7 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size), * @param align buffers alignement of each frame in this pool * @return newly created audio frame pool on success, NULL on error. */ -FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(buffer_size_t size), +FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(size_t size), int channels, int samples, enum AVSampleFormat format, diff --git a/libavfilter/vf_showinfo.c b/libavfilter/vf_showinfo.c index ae6f6bb7b1..2529cb2851 100644 --- a/libavfilter/vf_showinfo.c +++ b/libavfilter/vf_showinfo.c @@ -340,7 +340,8 @@ static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSi int i; if (sd->size < uuid_size) { - av_log(ctx, AV_LOG_ERROR, "invalid data(%d < UUID(%d-bytes))\n", sd->size, uuid_size); + av_log(ctx, AV_LOG_ERROR, "invalid data(%"SIZE_SPECIFIER" < " + "UUID(%d-bytes))\n", sd->size, uuid_size); return; } @@ -498,7 +499,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_log(ctx, AV_LOG_INFO, "pan/scan"); break; case AV_FRAME_DATA_A53_CC: - av_log(ctx, AV_LOG_INFO, "A/53 closed captions (%d bytes)", sd->size); + av_log(ctx, AV_LOG_INFO, "A/53 closed captions " + "(%"SIZE_SPECIFIER" bytes)", sd->size); break; case AV_FRAME_DATA_SPHERICAL: dump_spherical(ctx, frame, sd); @@ -545,8 +547,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) dump_sei_unregistered_metadata(ctx, sd); break; default: - av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)\n", - sd->type, sd->size); + av_log(ctx, AV_LOG_WARNING, "unknown side data type %d " + "(%"SIZE_SPECIFIER" bytes)\n", sd->type, sd->size); break; } |