generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavu: remove disabled FF_API_GET_BITS_PER_SAMPLE_FMT cruft

Browse Source
This commit is contained in:
Anton Khirnov 2012-10-22 14:36:14 +02:00
parent 468ea9d5b1
commit 8207c67a24
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/samplefmt.c
View File

@ -98,14 +98,6 @@ int av_get_bytes_per_sample(enum AVSampleFormat sample_fmt)
0 : sample_fmt_info[sample_fmt].bits >> 3; 0 : sample_fmt_info[sample_fmt].bits >> 3;
} }
#if FF_API_GET_BITS_PER_SAMPLE_FMT
int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt)
{
return sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB ?
0 : sample_fmt_info[sample_fmt].bits;
}
#endif
int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt) int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt)
{ {
if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB) if (sample_fmt < 0 || sample_fmt >= AV_SAMPLE_FMT_NB)

8
libavutil/samplefmt.h
View File

@ -111,14 +111,6 @@ enum AVSampleFormat av_get_planar_sample_fmt(enum AVSampleFormat sample_fmt);
*/ */
char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt); char *av_get_sample_fmt_string(char *buf, int buf_size, enum AVSampleFormat sample_fmt);
#if FF_API_GET_BITS_PER_SAMPLE_FMT
/**
* @deprecated Use av_get_bytes_per_sample() instead.
*/
attribute_deprecated
int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
#endif
/** /**
* Return number of bytes per sample. * Return number of bytes per sample.
* *

3
libavutil/version.h
View File

@ -61,9 +61,6 @@
* @{ * @{
*/ */
#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 52)
#endif
#ifndef FF_API_FIND_OPT #ifndef FF_API_FIND_OPT
#define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 52) #define FF_API_FIND_OPT (LIBAVUTIL_VERSION_MAJOR < 52)
#endif #endif