diff options
| -rw-r--r-- | libavcodec/avcodec.h | 32 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 19 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 54 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 73d112daa4..96b07b8c99 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4353,38 +4353,6 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum AVPixelFormat pix_fmt); int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, int has_alpha); -#if FF_API_FIND_BEST_PIX_FMT -/** - * @deprecated use avcodec_find_best_pix_fmt_of_2() instead. - * - * Find the best pixel format to convert to given a certain source pixel - * format. When converting from one pixel format to another, information loss - * may occur. For example, when converting from RGB24 to GRAY, the color - * information will be lost. Similarly, other losses occur when converting from - * some formats to other formats. avcodec_find_best_pix_fmt() searches which of - * the given pixel formats should be used to suffer the least amount of loss. - * The pixel formats from which it chooses one, are determined by the - * pix_fmt_mask parameter. - * - * Note, only the first 64 pixel formats will fit in pix_fmt_mask. - * - * @code - * src_pix_fmt = AV_PIX_FMT_YUV420P; - * pix_fmt_mask = (1 << AV_PIX_FMT_YUV422P) | (1 << AV_PIX_FMT_RGB24); - * dst_pix_fmt = avcodec_find_best_pix_fmt(pix_fmt_mask, src_pix_fmt, alpha, &loss); - * @endcode - * - * @param[in] pix_fmt_mask bitmask determining which pixel format to choose from - * @param[in] src_pix_fmt source pixel format - * @param[in] has_alpha Whether the source pixel format alpha channel is used. - * @param[out] loss_ptr Combination of flags informing you what kind of losses will occur. - * @return The best pixel format to convert to or -1 if none was found. - */ -attribute_deprecated -enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt, - int has_alpha, int *loss_ptr); -#endif /* FF_API_FIND_BEST_PIX_FMT */ - /** * Find the best pixel format to convert to given a certain source pixel * format. When converting from one pixel format to another, information loss diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 6c3bb368ec..cf3c9677f9 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -215,25 +215,6 @@ int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, return loss; } -#if FF_API_FIND_BEST_PIX_FMT -enum AVPixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum AVPixelFormat src_pix_fmt, - int has_alpha, int *loss_ptr) -{ - enum AVPixelFormat dst_pix_fmt; - int i; - - if (loss_ptr) /* all losses count (for backward compatibility) */ - *loss_ptr = 0; - - dst_pix_fmt = AV_PIX_FMT_NONE; /* so first iteration doesn't have to be treated special */ - for(i = 0; i< FFMIN(AV_PIX_FMT_NB, 64); i++){ - if (pix_fmt_mask & (1ULL << i)) - dst_pix_fmt = avcodec_find_best_pix_fmt_of_2(dst_pix_fmt, i, src_pix_fmt, has_alpha, loss_ptr); - } - return dst_pix_fmt; -} -#endif /* FF_API_FIND_BEST_PIX_FMT */ - enum AVPixelFormat avcodec_find_best_pix_fmt_of_2(enum AVPixelFormat dst_pix_fmt1, enum AVPixelFormat dst_pix_fmt2, enum AVPixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) { diff --git a/libavcodec/version.h b/libavcodec/version.h index 48dc26e385..ffa2aa23cc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -70,9 +70,6 @@ #ifndef FF_API_OLD_ENCODE_VIDEO #define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 56) #endif -#ifndef FF_API_FIND_BEST_PIX_FMT -#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55) -#endif #ifndef FF_API_CODEC_ID #define FF_API_CODEC_ID (LIBAVCODEC_VERSION_MAJOR < 56) #endif |