virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Add av_get_bits_per_sample_fmt() to libavcore/samplefmt.h and

Browse Source 
deprecate av_get_bits_per_sample_format().

Originally committed as revision 25654 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Stefano Sabatini 2010-11-02 22:20:49 +00:00
parent d63e456a2a
commit 6f84cd1279
6 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -13,6 +13,10 @@ libavutil: 2009-03-08
API changes, most recent first: API changes, most recent first:
2010-11-02 - r25654 - lavcore 0.12.0 - av_get_bits_per_sample_fmt()
Add av_get_bits_per_sample_fmt() to libavcore/samplefmt.h and
deprecate av_get_bits_per_sample_format().
2010-11-02 - r25653 - lavcore 0.11.0 - samplefmt.h 2010-11-02 - r25653 - lavcore 0.11.0 - samplefmt.h
Add sample format functions in libavcore/samplefmt.h: Add sample format functions in libavcore/samplefmt.h:
av_get_sample_fmt_name(), av_get_sample_fmt_name(),

10
libavcodec/avcodec.h
View File

@ -33,7 +33,7 @@
#define LIBAVCODEC_VERSION_MAJOR 52 #define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 94 #define LIBAVCODEC_VERSION_MINOR 94
#define LIBAVCODEC_VERSION_MICRO 2 #define LIBAVCODEC_VERSION_MICRO 3
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \
@ -3739,13 +3739,13 @@ char av_get_pict_type_char(int pict_type);
*/ */
int av_get_bits_per_sample(enum CodecID codec_id); int av_get_bits_per_sample(enum CodecID codec_id);
#if FF_API_OLD_SAMPLE_FMT
/** /**
* Return sample format bits per sample. * @deprecated Use av_get_bits_per_sample_fmt() instead.
*
* @param[in] sample_fmt the sample format
* @return Number of bits per sample or zero if unknown for the given sample format.
*/ */
attribute_deprecated
int av_get_bits_per_sample_format(enum SampleFormat sample_fmt); int av_get_bits_per_sample_format(enum SampleFormat sample_fmt);
#endif
/* frame parsing */ /* frame parsing */
typedef struct AVCodecParserContext { typedef struct AVCodecParserContext {

16
libavcodec/utils.c
View File

@ -1064,21 +1064,11 @@ int av_get_bits_per_sample(enum CodecID codec_id){
} }
} }
#if FF_API_OLD_SAMPLE_FMT
int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) { int av_get_bits_per_sample_format(enum SampleFormat sample_fmt) {
switch (sample_fmt) { return av_get_bits_per_sample_fmt(sample_fmt);
case SAMPLE_FMT_U8:
return 8;
case SAMPLE_FMT_S16:
return 16;
case SAMPLE_FMT_S32:
case SAMPLE_FMT_FLT:
return 32;
case SAMPLE_FMT_DBL:
return 64;
default:
return 0;
}
} }
#endif
#if !HAVE_THREADS #if !HAVE_THREADS
int avcodec_thread_init(AVCodecContext *s, int thread_count){ int avcodec_thread_init(AVCodecContext *s, int thread_count){

2
libavcore/avcore.h
View File

@ -27,7 +27,7 @@
#include "libavutil/avutil.h" #include "libavutil/avutil.h"
#define LIBAVCORE_VERSION_MAJOR 0 #define LIBAVCORE_VERSION_MAJOR 0
#define LIBAVCORE_VERSION_MINOR 11 #define LIBAVCORE_VERSION_MINOR 12
#define LIBAVCORE_VERSION_MICRO 0 #define LIBAVCORE_VERSION_MICRO 0
#define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \ #define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \

6
libavcore/samplefmt.c
View File

@ -62,3 +62,9 @@ char *av_get_sample_fmt_string (char *buf, int buf_size, enum AVSampleFormat sam
return buf; return buf;
} }
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;
}

9
libavcore/samplefmt.h
View File

@ -58,4 +58,13 @@ enum AVSampleFormat av_get_sample_fmt(const char *name);
*/ */
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);
/**
* Return sample format bits per sample.
*
* @param sample_fmt the sample format
* @return number of bits per sample or zero if unknown for the given
* sample format
*/
int av_get_bits_per_sample_fmt(enum AVSampleFormat sample_fmt);
#endif /* AVCORE_SAMPLEFMT_H */ #endif /* AVCORE_SAMPLEFMT_H */