"Fork" is an ambiguous term, since there may be more than one fork, also "fork" could be confused with the corresponding function. Also it seems important to point the name of the referenced fork in the symbol.
Unified · Split
| @@ -102,6 +102,8 @@ Configuration options: · 101 unmodified lines | ||
| 102 | 102 | --enable-gray enable full grayscale support (slower color) |
| 103 | 103 | --disable-swscale-alpha disable alpha channel support in swscale |
| 104 | 104 | --disable-all disable building components, libraries and programs |
| 105 | + --enable-incompatible-libav-abi enable incompatible Libav fork ABI [no] | |
| 106 | + --enable-incompatible-fork-abi enable incompatible Libav fork ABI (deprecated) [no] | |
| 105 | 107 | |
| 106 | 108 | Program options: |
| 107 | 109 | --disable-programs do not build command line programs |
| @@ -1259,6 +1261,7 @@ CONFIG_LIST=" · 1151 unmodified lines | ||
| 1259 | 1261 | gpl |
| 1260 | 1262 | gray |
| 1261 | 1263 | hardcoded_tables |
| 1264 | + incompatible_libav_abi | |
| 1262 | 1265 | incompatible_fork_abi |
| 1263 | 1266 | lsp |
| 1264 | 1267 | lzo |
| @@ -1365,6 +1368,7 @@ HAVE_LIST_CMDLINE=' · 100 unmodified lines | ||
| 1365 | 1368 | HAVE_LIST_PUB=' |
| 1366 | 1369 | bigendian |
| 1367 | 1370 | fast_unaligned |
| 1371 | + incompatible_libav_abi | |
| 1368 | 1372 | incompatible_fork_abi |
| 1369 | 1373 | ' |
| 1370 | 1374 | |
| @@ -3700,6 +3704,10 @@ EOF · 2329 unmodified lines | ||
| 3700 | 3704 | exit 1; |
| 3701 | 3705 | fi |
| 3702 | 3706 | |
| 3707 | +# backward compatibility layer for incompatible_libav/fork_abi | |
| 3708 | +enabled incompatible_fork_abi && enable incompatible_libav_abi | |
| 3709 | +enabled incompatible_libav_abi && enable incompatible_fork_abi | |
| 3710 | + | |
| 3703 | 3711 | die_license_disabled() { |
| 3704 | 3712 | enabled $1 || { enabled $2 && die "$2 is $1 and --enable-$1 is not specified."; } |
| 3705 | 3713 | } |
| @@ -4490,7 +4490,7 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt · 4489 unmodified lines | ||
| 4490 | 4490 | enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); |
| 4491 | 4491 | |
| 4492 | 4492 | attribute_deprecated |
| 4493 | −#if AV_HAVE_INCOMPATIBLE_FORK_ABI | |
| 4493 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 4494 | 4494 | enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list, |
| 4495 | 4495 | enum AVPixelFormat src_pix_fmt, |
| 4496 | 4496 | int has_alpha, int *loss_ptr); |
| @@ -247,7 +247,7 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt · 246 unmodified lines | ||
| 247 | 247 | return dst_pix_fmt; |
| 248 | 248 | } |
| 249 | 249 | |
| 250 | −#if AV_HAVE_INCOMPATIBLE_FORK_ABI | |
| 250 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 251 | 251 | enum AVPixelFormat avcodec_find_best_pix_fmt2(enum AVPixelFormat *pix_fmt_list, |
| 252 | 252 | enum AVPixelFormat src_pix_fmt, |
| 253 | 253 | int has_alpha, int *loss_ptr){ |
| @@ -136,7 +136,7 @@ struct vdpau_render_state { · 135 unmodified lines | ||
| 136 | 136 | |
| 137 | 137 | int state; ///< Holds FF_VDPAU_STATE_* values. |
| 138 | 138 | |
| 139 | −#if AV_HAVE_INCOMPATIBLE_FORK_ABI | |
| 139 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 140 | 140 | /** picture parameter information for all supported codecs */ |
| 141 | 141 | union FFVdpPictureInfo info; |
| 142 | 142 | #endif |
| @@ -148,7 +148,7 @@ struct vdpau_render_state { · 5 unmodified lines | ||
| 148 | 148 | /** The user is responsible for freeing this buffer using av_freep(). */ |
| 149 | 149 | VdpBitstreamBuffer *bitstream_buffers; |
| 150 | 150 | |
| 151 | −#if !AV_HAVE_INCOMPATIBLE_FORK_ABI | |
| 151 | +#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 152 | 152 | /** picture parameter information for all supported codecs */ |
| 153 | 153 | union FFVdpPictureInfo info; |
| 154 | 154 | #endif |
| @@ -245,7 +245,7 @@ enum AVPixelFormat { · 244 unmodified lines | ||
| 245 | 245 | #endif |
| 246 | 246 | }; |
| 247 | 247 | |
| 248 | −#if AV_HAVE_INCOMPATIBLE_FORK_ABI | |
| 248 | +#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI | |
| 249 | 249 | #define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV |
| 250 | 250 | #define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV |
| 251 | 251 | #endif |