History

avutil/buffer: Switch AVBuffer API to size_t

Announced in 14040a1d913794d9a3fd6406a6d8c2f0e37e0062.

Andreas Rheinhardt committed 5 years ago

Commit ef6a9e51 parent 985c0da66 files · +110 −206Browse files

Showing the changes to libavfilter (4 of 66 files). Show all

Unified · Split

4 files
  1. libavfilter/af_ashowinfo.c +2 −1
  2. libavfilter/framepool.c +2 −2
  3. libavfilter/framepool.h +2 −2
  4. libavfilter/vf_showinfo.c +6 −4
libavfilter/af_ashowinfo.c+2−1
@@ -170,7 +170,8 @@ static void dump_audio_service_type(AVFilterContext *ctx, AVFrameSideData *sd) · 169 unmodified lines
170170
171171 static void dump_unknown(AVFilterContext *ctx, AVFrameSideData *sd)
172172 {
173− av_log(ctx, AV_LOG_INFO, "unknown side data type: %d, size %d bytes", sd->type, sd->size);
173+ av_log(ctx, AV_LOG_INFO, "unknown side data type: %d, size "
174+ "%"SIZE_SPECIFIER" bytes", sd->type, sd->size);
174175 }
175176
176177 static int filter_frame(AVFilterLink *inlink, AVFrame *buf)
libavfilter/framepool.c+2−2
@@ -48,7 +48,7 @@ struct FFFramePool { · 47 unmodified lines
4848
4949 };
5050
51−FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size),
51+FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size),
5252 int width,
5353 int height,
5454 enum AVPixelFormat format,
@@ -115,7 +115,7 @@ fail: · 60 unmodified lines
115115 return NULL;
116116 }
117117
118−FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(buffer_size_t size),
118+FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(size_t size),
119119 int channels,
120120 int nb_samples,
121121 enum AVSampleFormat format,
libavfilter/framepool.h+2−2
@@ -44,7 +44,7 @@ typedef struct FFFramePool FFFramePool; · 43 unmodified lines
4444 * @param align buffers alignement of each frame in this pool
4545 * @return newly created video frame pool on success, NULL on error.
4646 */
47−FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size),
47+FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(size_t size),
4848 int width,
4949 int height,
5050 enum AVPixelFormat format,
@@ -62,7 +62,7 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size), · 11 unmodified lines
6262 * @param align buffers alignement of each frame in this pool
6363 * @return newly created audio frame pool on success, NULL on error.
6464 */
65−FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(buffer_size_t size),
65+FFFramePool *ff_frame_pool_audio_init(AVBufferRef* (*alloc)(size_t size),
6666 int channels,
6767 int samples,
6868 enum AVSampleFormat format,
libavfilter/vf_showinfo.c+6−4
@@ -340,7 +340,8 @@ static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSi · 339 unmodified lines
340340 int i;
341341
342342 if (sd->size < uuid_size) {
343− av_log(ctx, AV_LOG_ERROR, "invalid data(%d < UUID(%d-bytes))\n", sd->size, uuid_size);
343+ av_log(ctx, AV_LOG_ERROR, "invalid data(%"SIZE_SPECIFIER" < "
344+ "UUID(%d-bytes))\n", sd->size, uuid_size);
344345 return;
345346 }
346347
@@ -498,7 +499,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 151 unmodified lines
498499 av_log(ctx, AV_LOG_INFO, "pan/scan");
499500 break;
500501 case AV_FRAME_DATA_A53_CC:
501− av_log(ctx, AV_LOG_INFO, "A/53 closed captions (%d bytes)", sd->size);
502+ av_log(ctx, AV_LOG_INFO, "A/53 closed captions "
503+ "(%"SIZE_SPECIFIER" bytes)", sd->size);
502504 break;
503505 case AV_FRAME_DATA_SPHERICAL:
504506 dump_spherical(ctx, frame, sd);
@@ -545,8 +547,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 40 unmodified lines
545547 dump_sei_unregistered_metadata(ctx, sd);
546548 break;
547549 default:
548− av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)\n",
549− sd->type, sd->size);
550+ av_log(ctx, AV_LOG_WARNING, "unknown side data type %d "
551+ "(%"SIZE_SPECIFIER" bytes)\n", sd->type, sd->size);
550552 break;
551553 }
552554

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t