Announced in 14040a1d913794d9a3fd6406a6d8c2f0e37e0062.
Showing the changes to libavfilter (4 of 66 files). Show all
Unified · Split
| @@ -170,7 +170,8 @@ static void dump_audio_service_type(AVFilterContext *ctx, AVFrameSideData *sd) · 169 unmodified lines | |||
| 170 | 170 | ||
| 171 | static void dump_unknown(AVFilterContext *ctx, AVFrameSideData *sd) | 171 | static void dump_unknown(AVFilterContext *ctx, AVFrameSideData *sd) |
| 172 | { | 172 | { |
| 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); | ||
| 174 | } | 175 | } |
| 175 | 176 | ||
| 176 | static int filter_frame(AVFilterLink *inlink, AVFrame *buf) | 177 | static int filter_frame(AVFilterLink *inlink, AVFrame *buf) |
| @@ -48,7 +48,7 @@ struct FFFramePool { · 47 unmodified lines | |||
| 48 | 48 | ||
| 49 | }; | 49 | }; |
| 50 | 50 | ||
| 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), |
| 52 | int width, | 52 | int width, |
| 53 | int height, | 53 | int height, |
| 54 | enum AVPixelFormat format, | 54 | enum AVPixelFormat format, |
| @@ -115,7 +115,7 @@ fail: · 60 unmodified lines | |||
| 115 | return NULL; | 115 | return NULL; |
| 116 | } | 116 | } |
| 117 | 117 | ||
| 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), |
| 119 | int channels, | 119 | int channels, |
| 120 | int nb_samples, | 120 | int nb_samples, |
| 121 | enum AVSampleFormat format, | 121 | enum AVSampleFormat format, |
| @@ -44,7 +44,7 @@ typedef struct FFFramePool FFFramePool; · 43 unmodified lines | |||
| 44 | * @param align buffers alignement of each frame in this pool | 44 | * @param align buffers alignement of each frame in this pool |
| 45 | * @return newly created video frame pool on success, NULL on error. | 45 | * @return newly created video frame pool on success, NULL on error. |
| 46 | */ | 46 | */ |
| 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), |
| 48 | int width, | 48 | int width, |
| 49 | int height, | 49 | int height, |
| 50 | enum AVPixelFormat format, | 50 | enum AVPixelFormat format, |
| @@ -62,7 +62,7 @@ FFFramePool *ff_frame_pool_video_init(AVBufferRef* (*alloc)(buffer_size_t size), · 11 unmodified lines | |||
| 62 | * @param align buffers alignement of each frame in this pool | 62 | * @param align buffers alignement of each frame in this pool |
| 63 | * @return newly created audio frame pool on success, NULL on error. | 63 | * @return newly created audio frame pool on success, NULL on error. |
| 64 | */ | 64 | */ |
| 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), |
| 66 | int channels, | 66 | int channels, |
| 67 | int samples, | 67 | int samples, |
| 68 | enum AVSampleFormat format, | 68 | enum AVSampleFormat format, |
| @@ -340,7 +340,8 @@ static void dump_sei_unregistered_metadata(AVFilterContext *ctx, const AVFrameSi · 339 unmodified lines | |||
| 340 | int i; | 340 | int i; |
| 341 | 341 | ||
| 342 | if (sd->size < uuid_size) { | 342 | 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); | ||
| 344 | return; | 345 | return; |
| 345 | } | 346 | } |
| 346 | 347 | ||
| @@ -498,7 +499,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 151 unmodified lines | |||
| 498 | av_log(ctx, AV_LOG_INFO, "pan/scan"); | 499 | av_log(ctx, AV_LOG_INFO, "pan/scan"); |
| 499 | break; | 500 | break; |
| 500 | case AV_FRAME_DATA_A53_CC: | 501 | 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); | ||
| 502 | break; | 504 | break; |
| 503 | case AV_FRAME_DATA_SPHERICAL: | 505 | case AV_FRAME_DATA_SPHERICAL: |
| 504 | dump_spherical(ctx, frame, sd); | 506 | dump_spherical(ctx, frame, sd); |
| @@ -545,8 +547,8 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) · 40 unmodified lines | |||
| 545 | dump_sei_unregistered_metadata(ctx, sd); | 547 | dump_sei_unregistered_metadata(ctx, sd); |
| 546 | break; | 548 | break; |
| 547 | default: | 549 | default: |
| 548 | av_log(ctx, AV_LOG_WARNING, "unknown side data type %d (%d bytes)\n", | 550 | av_log(ctx, AV_LOG_WARNING, "unknown side data type %d " |
| 549 | sd->type, sd->size); | 551 | "(%"SIZE_SPECIFIER" bytes)\n", sd->type, sd->size); |
| 550 | break; | 552 | break; |
| 551 | } | 553 | } |
| 552 | 554 | ||