virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavc: remove disabled FF_API_OLD_SAMPLE_FMT cruft.

Browse Source
This commit is contained in:
Anton Khirnov 2012-01-22 10:56:42 +01:00
parent 6c8dab98b8
commit 284e65d64e
5 changed files with 0 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/audioconvert.c
View File

@ -31,23 +31,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "audioconvert.h" #include "audioconvert.h"
#if FF_API_OLD_SAMPLE_FMT
const char *avcodec_get_sample_fmt_name(int sample_fmt)
{
return av_get_sample_fmt_name(sample_fmt);
}
enum AVSampleFormat avcodec_get_sample_fmt(const char* name)
{
return av_get_sample_fmt(name);
}
void avcodec_sample_fmt_string (char *buf, int buf_size, int sample_fmt)
{
av_get_sample_fmt_string(buf, buf_size, sample_fmt);
}
#endif
uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name) uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name)
{ {
switch(nb_channels) { switch(nb_channels) {

20
libavcodec/audioconvert.h
View File

@ -33,26 +33,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#if FF_API_OLD_SAMPLE_FMT
/**
* @deprecated Use av_get_sample_fmt_string() instead.
*/
attribute_deprecated
void avcodec_sample_fmt_string(char *buf, int buf_size, int sample_fmt);
/**
* @deprecated Use av_get_sample_fmt_name() instead.
*/
attribute_deprecated
const char *avcodec_get_sample_fmt_name(int sample_fmt);
/**
* @deprecated Use av_get_sample_fmt() instead.
*/
attribute_deprecated
enum AVSampleFormat avcodec_get_sample_fmt(const char* name);
#endif
#if FF_API_OLD_AUDIOCONVERT #if FF_API_OLD_AUDIOCONVERT
/** /**
* @deprecated Use av_get_channel_layout() instead. * @deprecated Use av_get_channel_layout() instead.

20
libavcodec/avcodec.h
View File

@ -424,18 +424,6 @@ enum CodecID {
CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information. CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams containing only metadata information.
}; };
#if FF_API_OLD_SAMPLE_FMT
#define SampleFormat AVSampleFormat
#define SAMPLE_FMT_NONE AV_SAMPLE_FMT_NONE
#define SAMPLE_FMT_U8 AV_SAMPLE_FMT_U8
#define SAMPLE_FMT_S16 AV_SAMPLE_FMT_S16
#define SAMPLE_FMT_S32 AV_SAMPLE_FMT_S32
#define SAMPLE_FMT_FLT AV_SAMPLE_FMT_FLT
#define SAMPLE_FMT_DBL AV_SAMPLE_FMT_DBL
#define SAMPLE_FMT_NB AV_SAMPLE_FMT_NB
#endif
#if FF_API_OLD_AUDIOCONVERT #if FF_API_OLD_AUDIOCONVERT
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
@ -4197,14 +4185,6 @@ 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
/**
* @deprecated Use av_get_bytes_per_sample() instead.
*/
attribute_deprecated
int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt);
#endif
/* frame parsing */ /* frame parsing */
typedef struct AVCodecParserContext { typedef struct AVCodecParserContext {
void *priv_data; void *priv_data;

6
libavcodec/utils.c
View File

@ -1658,12 +1658,6 @@ int av_get_bits_per_sample(enum CodecID codec_id){
} }
} }
#if FF_API_OLD_SAMPLE_FMT
int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt) {
return av_get_bytes_per_sample(sample_fmt) << 3;
}
#endif
#if !HAVE_THREADS #if !HAVE_THREADS
int ff_thread_init(AVCodecContext *s){ int ff_thread_init(AVCodecContext *s){
return -1; return -1;

3
libavcodec/version.h
View File

@ -38,9 +38,6 @@
* Those FF_API_* defines are not part of public API. * Those FF_API_* defines are not part of public API.
* They may change, break or disappear at any time. * They may change, break or disappear at any time.
*/ */
#ifndef FF_API_OLD_SAMPLE_FMT
#define FF_API_OLD_SAMPLE_FMT (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#ifndef FF_API_OLD_AUDIOCONVERT #ifndef FF_API_OLD_AUDIOCONVERT
#define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54) #define FF_API_OLD_AUDIOCONVERT (LIBAVCODEC_VERSION_MAJOR < 54)
#endif #endif