diff options
| author | Marton Balint <cus@passwd.hu> | 2020-02-28 00:26:20 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2020-03-14 22:25:25 +0100 |
| commit | aef2016bb02fba377481789bf6a84e1176b83c25 (patch) | |
| tree | e8946d1a1cfff1904a3b5dad2f7d732dfec45715 /libavformat/audiointerleave.h | |
| parent | abbb466368c51285ca27d5e3959a16a9591e9a4c (diff) | |
avformat/audiointerleave: disallow using a samples_per_frame array
Only MXF used an actual sample array, and that is unneeded there because simple
rounding rules can be used instead.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/audiointerleave.h')
| -rw-r--r-- | libavformat/audiointerleave.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/audiointerleave.h b/libavformat/audiointerleave.h index f28d5fefcc..0933310f4c 100644 --- a/libavformat/audiointerleave.h +++ b/libavformat/audiointerleave.h @@ -29,14 +29,15 @@ typedef struct AudioInterleaveContext { AVFifoBuffer *fifo; unsigned fifo_size; ///< size of currently allocated FIFO + int64_t n; ///< number of generated packets + int64_t nb_samples; ///< number of generated samples uint64_t dts; ///< current dts int sample_size; ///< size of one sample all channels included - const int *samples_per_frame; ///< must be 0-terminated - const int *samples; ///< current samples per frame, pointer to samples_per_frame + int samples_per_frame; ///< samples per frame if fixed, 0 otherwise AVRational time_base; ///< time base of output audio packets } AudioInterleaveContext; -int ff_audio_interleave_init(AVFormatContext *s, const int *samples_per_frame, AVRational time_base); +int ff_audio_interleave_init(AVFormatContext *s, const int samples_per_frame, AVRational time_base); void ff_audio_interleave_close(AVFormatContext *s); /** |