diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-12-04 12:56:21 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-12-04 12:56:21 +0000 |
| commit | bb4afa13dd3264832bc379bbfefe1db8cf4f0e40 (patch) | |
| tree | 9ec62bfd5a328dda35f0d6c935aad05da3b924d2 /libavcodec | |
| parent | 4da12e3b13d362e0218956a78dd2b8f7a1260265 (diff) | |
| download | ffmpeg-bb4afa13dd3264832bc379bbfefe1db8cf4f0e40.tar.gz | |
Deprecate avcodec_pix_fmt_string() in favor of
av_get_pix_fmt_string(), added to libavutil/pixdesc.h.
Originally committed as revision 25879 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 14 | ||||
| -rw-r--r-- | libavcodec/imgconvert.c | 17 |
2 files changed, 6 insertions, 25 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1ec4842d9d..1f59b0c544 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -33,7 +33,7 @@ #define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MINOR 97 -#define LIBAVCODEC_VERSION_MICRO 2 +#define LIBAVCODEC_VERSION_MICRO 3 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ @@ -3285,18 +3285,12 @@ int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_ enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt, int has_alpha, int *loss_ptr); - +#if LIBAVCODEC_VERSION_MAJOR < 53 /** - * Print in buf the string corresponding to the pixel format with - * number pix_fmt, or an header if pix_fmt is negative. - * - * @param[in] buf the buffer where to write the string - * @param[in] buf_size the size of buf - * @param[in] pix_fmt the number of the pixel format to print the corresponding info string, or - * a negative value to print the corresponding header. - * Meaningful values for obtaining a pixel format info vary from 0 to PIX_FMT_NB -1. + * @deprecated Use av_get_pix_fmt_string() instead. */ void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt); +#endif #define FF_ALPHA_TRANSP 0x0001 /* image has some totally transparent pixels */ #define FF_ALPHA_SEMI_TRANSP 0x0002 /* image has some transparent pixels */ diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 879532d8b6..790ce80ac0 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -431,25 +431,12 @@ enum PixelFormat avcodec_get_pix_fmt(const char *name) { return av_get_pix_fmt(name); } -#endif void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt) { - /* print header */ - if (pix_fmt < 0) - snprintf (buf, buf_size, - "name " " nb_components" " nb_bits" - ); - else{ - const AVPixFmtDescriptor *pixdesc = &av_pix_fmt_descriptors[pix_fmt]; - snprintf (buf, buf_size, - "%-11s %7d %10d", - pixdesc->name, - pixdesc->nb_components, - av_get_bits_per_pixel(pixdesc) - ); - } + av_get_pix_fmt_string(buf, buf_size, pix_fmt); } +#endif int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt) { |