← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavcodec/aacadtsdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/aacadtsdec.c
31
31
    int size, rdb, ch, sr;
32
32
    int aot, crc_abs;
33
33
 
34
 
    if(get_bits(gbc, 12) != 0xfff)
 
34
    if (get_bits(gbc, 12) != 0xfff)
35
35
        return AAC_AC3_PARSE_ERROR_SYNC;
36
36
 
37
37
    skip_bits1(gbc);             /* id */
39
39
    crc_abs = get_bits1(gbc);    /* protection_absent */
40
40
    aot     = get_bits(gbc, 2);  /* profile_objecttype */
41
41
    sr      = get_bits(gbc, 4);  /* sample_frequency_index */
42
 
    if(!avpriv_mpeg4audio_sample_rates[sr])
 
42
    if (!avpriv_mpeg4audio_sample_rates[sr])
43
43
        return AAC_AC3_PARSE_ERROR_SAMPLE_RATE;
44
44
    skip_bits1(gbc);             /* private_bit */
45
 
    ch      = get_bits(gbc, 3);  /* channel_configuration */
 
45
    ch = get_bits(gbc, 3);       /* channel_configuration */
46
46
 
47
47
    skip_bits1(gbc);             /* original/copy */
48
48
    skip_bits1(gbc);             /* home */
50
50
    /* adts_variable_header */
51
51
    skip_bits1(gbc);             /* copyright_identification_bit */
52
52
    skip_bits1(gbc);             /* copyright_identification_start */
53
 
    size    = get_bits(gbc, 13); /* aac_frame_length */
54
 
    if(size < AAC_ADTS_HEADER_SIZE)
 
53
    size = get_bits(gbc, 13);    /* aac_frame_length */
 
54
    if (size < AAC_ADTS_HEADER_SIZE)
55
55
        return AAC_AC3_PARSE_ERROR_FRAME_SIZE;
56
56
 
57
57
    skip_bits(gbc, 11);          /* adts_buffer_fullness */