"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libavformat/riffdec.c" between
libav-11.7.tar.gz and libav-11.8.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.

riffdec.c  (libav-11.7):riffdec.c  (libav-11.8)
skipping to change at line 60 skipping to change at line 60
* WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure * WAVEFORMAT, PCMWAVEFORMAT or WAVEFORMATEX. Each structure
* is an expansion of the previous one with the fields added * is an expansion of the previous one with the fields added
* at the bottom. PCMWAVEFORMAT adds 'WORD wBitsPerSample' and * at the bottom. PCMWAVEFORMAT adds 'WORD wBitsPerSample' and
* WAVEFORMATEX adds 'WORD cbSize' and basically makes itself * WAVEFORMATEX adds 'WORD cbSize' and basically makes itself
* an openended structure. * an openended structure.
*/ */
static void parse_waveformatex(AVIOContext *pb, AVCodecContext *c) static void parse_waveformatex(AVIOContext *pb, AVCodecContext *c)
{ {
ff_asf_guid subformat; ff_asf_guid subformat;
c->bits_per_coded_sample = avio_rl16(pb); int bps;
bps = avio_rl16(pb);
if (bps)
c->bits_per_coded_sample = bps;
c->channel_layout = avio_rl32(pb); /* dwChannelMask */ c->channel_layout = avio_rl32(pb); /* dwChannelMask */
ff_get_guid(pb, &subformat); ff_get_guid(pb, &subformat);
if (!memcmp(subformat + 4, if (!memcmp(subformat + 4,
(const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) { (const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) {
c->codec_tag = AV_RL32(subformat); c->codec_tag = AV_RL32(subformat);
c->codec_id = ff_wav_codec_get_id(c->codec_tag, c->codec_id = ff_wav_codec_get_id(c->codec_tag,
c->bits_per_coded_sample); c->bits_per_coded_sample);
} else { } else {
c->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subformat); c->codec_id = ff_codec_guid_get_id(ff_codec_wav_guids, subformat);
 End of changes. 1 change blocks. 
1 lines changed or deleted 5 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS