← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavformat/omadec.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:
libavformat/omadec.c
40
40
 * Supported decoders: ATRAC3, ATRAC3+, MP3, LPCM
41
41
 */
42
42
 
 
43
#include <inttypes.h>
 
44
 
43
45
#include "libavutil/channel_layout.h"
44
46
#include "avformat.h"
45
47
#include "internal.h"
219
221
 
220
222
    if (geob->datasize < 64) {
221
223
        av_log(s, AV_LOG_ERROR,
222
 
               "Invalid GEOB data size: %u\n", geob->datasize);
 
224
               "Invalid GEOB data size: %"PRIu32"\n", geob->datasize);
223
225
        return AVERROR_INVALIDDATA;
224
226
    }
225
227
 
243
245
        return AVERROR_INVALIDDATA;
244
246
    }
245
247
    oc->rid = AV_RB32(&gdata[OMA_ENC_HEADER_SIZE + 28]);
246
 
    av_log(s, AV_LOG_DEBUG, "RID: %.8x\n", oc->rid);
 
248
    av_log(s, AV_LOG_DEBUG, "RID: %.8"PRIx32"\n", oc->rid);
247
249
 
248
250
    memcpy(oc->iv, &header[0x58], 8);
249
251
    hex_log(s, AV_LOG_DEBUG, "IV", oc->iv, 8);
372
374
        channel_id = (codec_params >> 10) & 7;
373
375
        if (!channel_id) {
374
376
            av_log(s, AV_LOG_ERROR,
375
 
                   "Invalid ATRAC-X channel id: %d\n", channel_id);
 
377
                   "Invalid ATRAC-X channel id: %"PRIu32"\n", channel_id);
376
378
            return AVERROR_INVALIDDATA;
377
379
        }
378
380
        st->codec->channel_layout = ff_oma_chid_to_native_layout[channel_id - 1];