"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libavformat/cafdec.c" between
libav-12.1.tar.gz and libav-12.2.tar.gz

About: libav provides cross-platform tools ("avconv") and libraries to convert, manipulate and stream a wide range of multimedia (audio and video) formats and protocols.

cafdec.c  (libav-12.1):cafdec.c  (libav-12.2)
skipping to change at line 159 skipping to change at line 159
avio_skip(pb, size - ALAC_PREAMBLE - ALAC_HEADER); avio_skip(pb, size - ALAC_PREAMBLE - ALAC_HEADER);
} else { } else {
AV_WB32(st->codecpar->extradata, 36); AV_WB32(st->codecpar->extradata, 36);
memcpy(&st->codecpar->extradata[4], "alac", 4); memcpy(&st->codecpar->extradata[4], "alac", 4);
AV_WB32(&st->codecpar->extradata[8], 0); AV_WB32(&st->codecpar->extradata[8], 0);
memcpy(&st->codecpar->extradata[12], preamble, 12); memcpy(&st->codecpar->extradata[12], preamble, 12);
avio_read(pb, &st->codecpar->extradata[24], ALAC_NEW_KUKI - 12); avio_read(pb, &st->codecpar->extradata[24], ALAC_NEW_KUKI - 12);
avio_skip(pb, size - ALAC_NEW_KUKI); avio_skip(pb, size - ALAC_NEW_KUKI);
} }
st->codecpar->extradata_size = ALAC_HEADER; st->codecpar->extradata_size = ALAC_HEADER;
} else if (st->codecpar->codec_id == AV_CODEC_ID_OPUS) {
// The data layout for Opus is currently unknown, so we do not export
// extradata at all. Multichannel streams are not supported.
if (st->codecpar->channels > 2) {
avpriv_request_sample(s, "multichannel Opus in CAF");
return AVERROR_PATCHWELCOME;
}
avio_skip(pb, size);
} else { } else {
st->codecpar->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE ); st->codecpar->extradata = av_mallocz(size + AV_INPUT_BUFFER_PADDING_SIZE );
if (!st->codecpar->extradata) if (!st->codecpar->extradata)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
avio_read(pb, st->codecpar->extradata, size); avio_read(pb, st->codecpar->extradata, size);
st->codecpar->extradata_size = size; st->codecpar->extradata_size = size;
} }
return 0; return 0;
} }
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)