Originally added as a private entry in commit 3f75e5116b900f1428aa13041fc7d6301bf1988a, but its grouping with the comment noting its private state was missed during merging of the field from Libav (most likely due to an already existing field in between).
Unified · Split
| @@ -14,6 +14,12 @@ libavutil: 2021-04-27 · 13 unmodified lines | |||
| 14 | 14 | ||
| 15 | API changes, most recent first: | 15 | API changes, most recent first: |
| 16 | 16 | ||
| 17 | 2021-10-13 - xxxxxxxxxx - lavf 59.7.100 - avio.h | ||
| 18 | Deprecate AVIOContext.written. Originally added as a private entry in | ||
| 19 | commit 3f75e5116b900f1428aa13041fc7d6301bf1988a, its grouping with | ||
| 20 | the comment noting its private state was missed during merging of the field | ||
| 21 | from Libav (most likely due to an already existing field in between). | ||
| 22 | |||
| 17 | 2021-09-21 - xxxxxxxxxx - lavu 57.7.100 - pixfmt.h | 23 | 2021-09-21 - xxxxxxxxxx - lavu 57.7.100 - pixfmt.h |
| 18 | Add AV_PIX_FMT_X2BGR10. | 24 | Add AV_PIX_FMT_X2BGR10. |
| 19 | 25 | ||
| @@ -290,7 +290,13 @@ typedef struct AVIOContext { · 289 unmodified lines | |||
| 290 | */ | 290 | */ |
| 291 | int ignore_boundary_point; | 291 | int ignore_boundary_point; |
| 292 | 292 | ||
| 293 | #if FF_API_AVIOCONTEXT_WRITTEN | ||
| 294 | /** | ||
| 295 | * @deprecated field utilized privately by libavformat. | ||
| 296 | */ | ||
| 297 | attribute_deprecated | ||
| 293 | int64_t written; | 298 | int64_t written; |
| 299 | #endif | ||
| 294 | 300 | ||
| 295 | /** | 301 | /** |
| 296 | * Maximum reached position before a backward seek in the write buffer, | 302 | * Maximum reached position before a backward seek in the write buffer, |
| @@ -22,6 +22,7 @@ · 21 unmodified lines | |||
| 22 | #include "libavutil/bprint.h" | 22 | #include "libavutil/bprint.h" |
| 23 | #include "libavutil/crc.h" | 23 | #include "libavutil/crc.h" |
| 24 | #include "libavutil/dict.h" | 24 | #include "libavutil/dict.h" |
| 25 | #include "libavutil/internal.h" | ||
| 25 | #include "libavutil/intreadwrite.h" | 26 | #include "libavutil/intreadwrite.h" |
| 26 | #include "libavutil/log.h" | 27 | #include "libavutil/log.h" |
| 27 | #include "libavutil/opt.h" | 28 | #include "libavutil/opt.h" |
| @@ -124,7 +125,11 @@ void ffio_init_context(FFIOContext *ctx, · 96 unmodified lines | |||
| 124 | ctx->current_type = AVIO_DATA_MARKER_UNKNOWN; | 125 | ctx->current_type = AVIO_DATA_MARKER_UNKNOWN; |
| 125 | ctx->last_time = AV_NOPTS_VALUE; | 126 | ctx->last_time = AV_NOPTS_VALUE; |
| 126 | ctx->short_seek_get = NULL; | 127 | ctx->short_seek_get = NULL; |
| 128 | #if FF_API_AVIOCONTEXT_WRITTEN | ||
| 129 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 127 | s->written = 0; | 130 | s->written = 0; |
| 131 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 132 | #endif | ||
| 128 | } | 133 | } |
| 129 | 134 | ||
| 130 | AVIOContext *avio_alloc_context( | 135 | AVIOContext *avio_alloc_context( |
| @@ -166,7 +171,11 @@ static void writeout(AVIOContext *s, const uint8_t *data, int len) · 35 unmodified lines | |||
| 166 | } else { | 171 | } else { |
| 167 | if (s->pos + len > ctx->written_output_size) { | 172 | if (s->pos + len > ctx->written_output_size) { |
| 168 | ctx->written_output_size = s->pos + len; | 173 | ctx->written_output_size = s->pos + len; |
| 174 | #if FF_API_AVIOCONTEXT_WRITTEN | ||
| 175 | FF_DISABLE_DEPRECATION_WARNINGS | ||
| 169 | s->written = ctx->written_output_size; | 176 | s->written = ctx->written_output_size; |
| 177 | FF_ENABLE_DEPRECATION_WARNINGS | ||
| 178 | #endif | ||
| 170 | } | 179 | } |
| 171 | } | 180 | } |
| 172 | } | 181 | } |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | |||
| 32 | // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) | 32 | // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) |
| 33 | // Also please add any ticket numbers that you believe might be affected here | 33 | // Also please add any ticket numbers that you believe might be affected here |
| 34 | #define LIBAVFORMAT_VERSION_MAJOR 59 | 34 | #define LIBAVFORMAT_VERSION_MAJOR 59 |
| 35 | #define LIBAVFORMAT_VERSION_MINOR 6 | 35 | #define LIBAVFORMAT_VERSION_MINOR 7 |
| 36 | #define LIBAVFORMAT_VERSION_MICRO 100 | 36 | #define LIBAVFORMAT_VERSION_MICRO 100 |
| 37 | 37 | ||
| 38 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ | 38 | #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ |
| @@ -61,6 +61,9 @@ · 22 unmodified lines | |||
| 61 | #ifndef FF_API_COMPUTE_PKT_FIELDS2 | 61 | #ifndef FF_API_COMPUTE_PKT_FIELDS2 |
| 62 | #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) | 62 | #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 60) |
| 63 | #endif | 63 | #endif |
| 64 | #ifndef FF_API_AVIOCONTEXT_WRITTEN | ||
| 65 | #define FF_API_AVIOCONTEXT_WRITTEN (LIBAVFORMAT_VERSION_MAJOR < 60) | ||
| 66 | #endif | ||
| 64 | 67 | ||
| 65 | 68 | ||
| 66 | #ifndef FF_API_R_FRAME_RATE | 69 | #ifndef FF_API_R_FRAME_RATE |