diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-28 10:23:28 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-02-28 10:26:16 +0400 |
| commit | 32d5cc247fc1cf9a71492a26cebf99f9505bb82a (patch) | |
| tree | d5a4efb5f93474ff044670c37f571e4835346ed5 /intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h | |
| parent | ba08031783a1aebc4559351454e3de1a9629b37a (diff) | |
Fix T38768: New "audio" button in 2.70 release does not 'mixdown' audio
Issue was caused by the way how audio output works from audaspace.
Now made it much closer to what's happening in ffmpeg.c and writeffmpeg.c.
Also fixed issues with incompatible combinations of codecs and formats
in mixdown settings.
Diffstat (limited to 'intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h')
| -rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h index 310f69258ea..743d885fca8 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h @@ -83,6 +83,16 @@ private: AVFrame *m_frame; /** + * PTS of next frame to write. + */ + int m_frame_pts; + + /** + * Number of bytes per sample. + */ + int m_audio_sample_size; + + /** * The input buffer for the format converted data before encoding. */ AUD_Buffer m_input_buffer; |