← Back to branch summary

~ubuntu-branches/ubuntu/wily/ffmpeg/wily

« back to all changes in this revision

Viewing changes to libswresample/swresample_internal.h

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun, Reinhard Tartler, Andreas Cadhalpun
  • Date: 2015-07-20 10:23:49 UTC
  • mfrom: (27.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20150720102349-prx70m0x0su1xek6
Tags: 7:2.7.2-1
http://bugs.debian.org/780344
[ Reinhard Tartler ]
* Add myself to uploaders.
* Merge qt-faststart back into 'ffmpeg'.

[ Andreas Cadhalpun ]
* Upload to unstable.
* Import new upstream bugfix release 2.7.2.
   - Make -xerror with multi-threading more robust. (Closes: #780344)
* Enable frei0r, opencv, x264, x265 on x32 and x265 on sparc64.
* Disable x264 on sparc64 due to #792921.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libswresample/swresample_internal.h
119
119
    int user_used_ch_count;                         ///< User set used channel count
120
120
    int64_t user_in_ch_layout;                      ///< User set input channel layout
121
121
    int64_t user_out_ch_layout;                     ///< User set output channel layout
 
122
    enum AVSampleFormat user_int_sample_fmt;        ///< User set internal sample format
122
123
 
123
124
    struct DitherContext dither;
124
125
 
157
158
    int64_t outpts;                                 ///< output PTS
158
159
    int64_t firstpts;                               ///< first PTS
159
160
    int drop_output;                                ///< number of output samples to drop
 
161
    double delayed_samples_fixup;                   ///< soxr 0.1.1: needed to fixup delayed_samples after flush has been called.
160
162
 
161
163
    struct AudioConvert *in_convert;                ///< input conversion context
162
164
    struct AudioConvert *out_convert;               ///< output conversion context