diff options
author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-12 14:04:40 +0300 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-11-12 14:04:40 +0300 |
commit | 5d6e4c160a4a0d71c17e8428123027c747ff0fb3 (patch) | |
tree | d3132b2b615fe19f3f4b5ad43b095c076320c780 /libavcodec/avcodec.h | |
parent | 09f47fa44ebf3f18651397517b49e6f8c5a0e374 (diff) |
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 7f28e9e9ff..b85fd24ddf 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1231,7 +1231,7 @@ typedef struct AVCodecContext { * - encoding: Set by user. * - decoding: Set by libavcodec. */ - enum SampleFormat sample_fmt; ///< sample format + enum AVSampleFormat sample_fmt; ///< sample format /* The following data should not be initialized. */ /** @@ -2555,7 +2555,7 @@ typedef struct AVCodecContext { /** * Bits per sample/pixel of internal libavcodec pixel/sample format. - * This field is applicable only when sample_fmt is SAMPLE_FMT_S32. + * This field is applicable only when sample_fmt is AV_SAMPLE_FMT_S32. * - encoding: set by user. * - decoding: set by libavcodec. */ @@ -2796,7 +2796,7 @@ typedef struct AVCodec { */ const char *long_name; const int *supported_samplerates; ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0 - const enum SampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1 + const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1 const int64_t *channel_layouts; ///< array of support channel layouts, or NULL if unknown. array is terminated by 0 uint8_t max_lowres; ///< maximum value for lowres supported by the decoder AVClass *priv_class; ///< AVClass for the private context @@ -3060,8 +3060,8 @@ attribute_deprecated ReSampleContext *audio_resample_init(int output_channels, i */ ReSampleContext *av_audio_resample_init(int output_channels, int input_channels, int output_rate, int input_rate, - enum SampleFormat sample_fmt_out, - enum SampleFormat sample_fmt_in, + enum AVSampleFormat sample_fmt_out, + enum AVSampleFormat sample_fmt_in, int filter_length, int log2_phase_count, int linear, double cutoff); @@ -3744,7 +3744,7 @@ int av_get_bits_per_sample(enum CodecID codec_id); * @deprecated Use av_get_bits_per_sample_fmt() instead. */ attribute_deprecated -int av_get_bits_per_sample_format(enum SampleFormat sample_fmt); +int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt); #endif /* frame parsing */ |