← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavformat/spdifenc.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:
libavformat/spdifenc.c
44
44
 *      dependent from data-type (spaces between packets are filled by zeros)
45
45
 */
46
46
 
 
47
#include <inttypes.h>
 
48
 
47
49
#include "avformat.h"
48
50
#include "avio_internal.h"
49
51
#include "spdif.h"
274
276
        av_log(s, AV_LOG_ERROR, "stray DTS-HD frame\n");
275
277
        return AVERROR_INVALIDDATA;
276
278
    default:
277
 
        av_log(s, AV_LOG_ERROR, "bad DTS syncword 0x%x\n", syncword_dts);
 
279
        av_log(s, AV_LOG_ERROR, "bad DTS syncword 0x%"PRIx32"\n", syncword_dts);
278
280
        return AVERROR_INVALIDDATA;
279
281
    }
280
282
    blocks++;
369
371
        ctx->data_type = IEC61937_MPEG2_AAC_LSF_4096;
370
372
        break;
371
373
    default:
372
 
        av_log(s, AV_LOG_ERROR, "%i samples in AAC frame not supported\n",
373
 
               hdr.samples);
 
374
        av_log(s, AV_LOG_ERROR,
 
375
               "%"PRIu32" samples in AAC frame not supported\n", hdr.samples);
374
376
        return AVERROR(EINVAL);
375
377
    }
376
378
    //TODO Data type dependent info (LC profile/SBR)