Merge commit 'e2854e731f843906d9a9a5b882bed872341999fd'

* commit 'e2854e731f843906d9a9a5b882bed872341999fd':
  avresample: Document avresample_open() a little better

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-11-10 18:07:41 +01:00
commit 240ac53a5c

View File

@ -167,9 +167,13 @@ AVAudioResampleContext *avresample_alloc_context(void);
/** /**
* Initialize AVAudioResampleContext. * Initialize AVAudioResampleContext.
* @note The context must be configured using the AVOption API. * @note The context must be configured using the AVOption API.
* @note The fields "in_channel_layout", "out_channel_layout",
* "in_sample_rate", "out_sample_rate", "in_sample_fmt",
* "out_sample_fmt" must be set.
* *
* @see av_opt_set_int() * @see av_opt_set_int()
* @see av_opt_set_dict() * @see av_opt_set_dict()
* @see av_get_default_channel_layout()
* *
* @param avr audio resample context * @param avr audio resample context
* @return 0 on success, negative AVERROR code on failure * @return 0 on success, negative AVERROR code on failure