← Back to branch summary

~ubuntu-branches/debian/experimental/libav/experimental

« back to all changes in this revision

Viewing changes to libavcodec/flacdec.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-08-10 09:45:02 UTC
  • mfrom: (1.1.28) (2.1.45 sid)
  • Revision ID: package-import@ubuntu.com-20140810094502-p8pds4kq0zpig5oq
Tags: 6:11~alpha1-1
http://bugs.debian.org/749164
* New upstream Release v11
  - Fixes Unchecked conversion from double to enum (Closes: #749164)
* Add some post v11_alpha1 patches from upstream
* All SONAMEs bumped because of internal changes, but external API is
  promised to have not changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/flacdec.c
156
156
        /* need more data */
157
157
        return 0;
158
158
    }
159
 
    avpriv_flac_parse_block_header(&buf[4], NULL, &metadata_type, &metadata_size);
 
159
    flac_parse_block_header(&buf[4], NULL, &metadata_type, &metadata_size);
160
160
    if (metadata_type != FLAC_METADATA_TYPE_STREAMINFO ||
161
161
        metadata_size != FLAC_STREAMINFO_SIZE) {
162
162
        return AVERROR_INVALIDDATA;
187
187
    do {
188
188
        if (buf_end - buf < 4)
189
189
            return 0;
190
 
        avpriv_flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size);
 
190
        flac_parse_block_header(buf, &metadata_last, NULL, &metadata_size);
191
191
        buf += 4;
192
192
        if (buf_end - buf < metadata_size) {
193
193
            /* need more data in order to read the complete header */