Revision 5d6e4c16 libavcodec/avcodec.h

View differences:

libavcodec/avcodec.h
1231 1231
     * - encoding: Set by user.
1232 1232
     * - decoding: Set by libavcodec.
1233 1233
     */
1234
    enum SampleFormat sample_fmt;  ///< sample format
1234
    enum AVSampleFormat sample_fmt;  ///< sample format
1235 1235

  
1236 1236
    /* The following data should not be initialized. */
1237 1237
    /**
......
2555 2555

  
2556 2556
    /**
2557 2557
     * Bits per sample/pixel of internal libavcodec pixel/sample format.
2558
     * This field is applicable only when sample_fmt is SAMPLE_FMT_S32.
2558
     * This field is applicable only when sample_fmt is AV_SAMPLE_FMT_S32.
2559 2559
     * - encoding: set by user.
2560 2560
     * - decoding: set by libavcodec.
2561 2561
     */
......
2796 2796
     */
2797 2797
    const char *long_name;
2798 2798
    const int *supported_samplerates;       ///< array of supported audio samplerates, or NULL if unknown, array is terminated by 0
2799
    const enum SampleFormat *sample_fmts;   ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
2799
    const enum AVSampleFormat *sample_fmts; ///< array of supported sample formats, or NULL if unknown, array is terminated by -1
2800 2800
    const int64_t *channel_layouts;         ///< array of support channel layouts, or NULL if unknown. array is terminated by 0
2801 2801
    uint8_t max_lowres;                     ///< maximum value for lowres supported by the decoder
2802 2802
    AVClass *priv_class;                    ///< AVClass for the private context
......
3060 3060
 */
3061 3061
ReSampleContext *av_audio_resample_init(int output_channels, int input_channels,
3062 3062
                                        int output_rate, int input_rate,
3063
                                        enum SampleFormat sample_fmt_out,
3064
                                        enum SampleFormat sample_fmt_in,
3063
                                        enum AVSampleFormat sample_fmt_out,
3064
                                        enum AVSampleFormat sample_fmt_in,
3065 3065
                                        int filter_length, int log2_phase_count,
3066 3066
                                        int linear, double cutoff);
3067 3067

  
......
3744 3744
 * @deprecated Use av_get_bits_per_sample_fmt() instead.
3745 3745
 */
3746 3746
attribute_deprecated
3747
int av_get_bits_per_sample_format(enum SampleFormat sample_fmt);
3747
int av_get_bits_per_sample_format(enum AVSampleFormat sample_fmt);
3748 3748
#endif
3749 3749

  
3750 3750
/* frame parsing */

Also available in: Unified diff