← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty

« back to all changes in this revision

Viewing changes to libavcodec/mlp_parser.h

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Jonas Smedegaard, Reinhard Tartler
  • Date: 2013-03-02 14:34:27 UTC
  • mfrom: (1.5.6)
  • mto: (1.3.35 sid)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20130302143427-wdmprnbkkccte051
Tags: 6:9.3-1
[ Jonas Smedegaard ]
* Stop using CDBS.

[ Reinhard Tartler ]
* Imported Upstream version 9.2 (never uploaded, though)
* Imported Upstream version 9.3:
  - Fixes CVE-2013-0894
* drop 02-fix-build-on-non-armv5te.patch, merged upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/mlp_parser.h
39
39
    int group1_samplerate;      ///< Sample rate of first substream
40
40
    int group2_samplerate;      ///< Sample rate of second substream (MLP only)
41
41
 
42
 
    int channels_mlp;           ///< Channel arrangement for MLP streams
43
 
    int channels_thd_stream1;   ///< Channel arrangement for substream 1 of TrueHD streams (5.1)
44
 
    int channels_thd_stream2;   ///< Channel arrangement for substream 2 of TrueHD streams (7.1)
 
42
    int channels_mlp;                       ///< Channel count for MLP streams
 
43
    int channels_thd_stream1;               ///< Channel count for substream 1 of TrueHD streams ("6-channel presentation")
 
44
    int channels_thd_stream2;               ///< Channel count for substream 2 of TrueHD streams ("8-channel presentation")
 
45
    uint64_t channel_layout_mlp;            ///< Channel layout for MLP streams
 
46
    uint64_t channel_layout_thd_stream1;    ///< Channel layout for substream 1 of TrueHD streams ("6-channel presentation")
 
47
    uint64_t channel_layout_thd_stream2;    ///< Channel layout for substream 2 of TrueHD streams ("8-channel presentation")
45
48
 
46
49
    int access_unit_size;       ///< Number of samples per coded frame
47
50
    int access_unit_size_pow2;  ///< Next power of two above number of samples per frame