diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2012-07-02 11:31:26 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2012-07-13 19:22:46 +0200 |
| commit | f30260d32a92c7e12984dd6fb2238da35d6a4c03 (patch) | |
| tree | 0c3d18f8c416d1f2cd5b2503650906aad4b4880d /libavcodec | |
| parent | ac29054fda1fab73c443b7d6f9dd72a9f25f7aae (diff) | |
| download | ffmpeg-f30260d32a92c7e12984dd6fb2238da35d6a4c03.tar.gz | |
imgconvert: deprecate avcodec_find_best_pix_fmt()
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 5 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9e1aa1c927..71f2e7093f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4202,7 +4202,10 @@ unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat pix_fmt); int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt, int has_alpha); +#if FF_API_FIND_BEST_PIX_FMT /** + * @deprecated use avcodec_find_best_pix_fmt2() 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 @@ -4224,8 +4227,10 @@ int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_ * @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 PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat 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 diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 5b22cab023..a6c832d5c9 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -622,6 +622,7 @@ static enum PixelFormat avcodec_find_best_pix_fmt1(enum PixelFormat *pix_fmt_lis return dst_pix_fmt; } +#if FF_API_FIND_BEST_PIX_FMT enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr) { @@ -637,6 +638,7 @@ enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelForma return avcodec_find_best_pix_fmt2(list, src_pix_fmt, has_alpha, loss_ptr); } +#endif /* FF_API_FIND_BEST_PIX_FMT */ enum PixelFormat avcodec_find_best_pix_fmt2(enum PixelFormat *pix_fmt_list, enum PixelFormat src_pix_fmt, diff --git a/libavcodec/version.h b/libavcodec/version.h index ff13f9d22d..87c69aa04e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -73,5 +73,8 @@ #ifndef FF_API_DSP_MASK #define FF_API_DSP_MASK (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_FIND_BEST_PIX_FMT +#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ |