Mercurial > libavcodec.hg

comparison aac.c @ 10657:168ea860d58f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aac: Set sample rate in avctx from ADTS header (if not already set by some other means)
author andoma
date Tue, 08 Dec 2009 19:20:36 +0000
parents 2474aceea736
children d55c821b147a
comparison
equal deleted inserted replaced
10656:34911596ffed 10657:168ea860d58f
1690 if (ac->output_configured != OC_LOCKED) 1690 if (ac->output_configured != OC_LOCKED)
1691 ac->m4ac.sbr = -1; 1691 ac->m4ac.sbr = -1;
1692 ac->m4ac.sample_rate = hdr_info.sample_rate; 1692 ac->m4ac.sample_rate = hdr_info.sample_rate;
1693 ac->m4ac.sampling_index = hdr_info.sampling_index; 1693 ac->m4ac.sampling_index = hdr_info.sampling_index;
1694 ac->m4ac.object_type = hdr_info.object_type; 1694 ac->m4ac.object_type = hdr_info.object_type;
1695 if (!ac->avccontext->sample_rate)
1696 ac->avccontext->sample_rate = hdr_info.sample_rate;
1695 if (hdr_info.num_aac_frames == 1) { 1697 if (hdr_info.num_aac_frames == 1) {
1696 if (!hdr_info.crc_absent) 1698 if (!hdr_info.crc_absent)
1697 skip_bits(gb, 16); 1699 skip_bits(gb, 16);
1698 } else { 1700 } else {
1699 av_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0); 1701 av_log_missing_feature(ac->avccontext, "More than one AAC RDB per ADTS frame is", 0);