Mercurial > libavcodec.hg

comparison aacsbr.c @ 11429:4eee52db3c4c libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
10l: Include missing return values in functions made non-void by the previous commit.
author alexc
date Tue, 09 Mar 2010 06:21:41 +0000
parents 6b0d65c8c13d
children d8c2170062ce
comparison
equal deleted inserted replaced
11428:6b0d65c8c13d 11429:4eee52db3c4c
871 read_sbr_envelope(sbr, gb, &sbr->data[0], 0); 871 read_sbr_envelope(sbr, gb, &sbr->data[0], 0);
872 read_sbr_noise(sbr, gb, &sbr->data[0], 0); 872 read_sbr_noise(sbr, gb, &sbr->data[0], 0);
873 873
874 if ((sbr->data[0].bs_add_harmonic_flag = get_bits1(gb))) 874 if ((sbr->data[0].bs_add_harmonic_flag = get_bits1(gb)))
875 get_bits1_vector(gb, sbr->data[0].bs_add_harmonic, sbr->n[1]); 875 get_bits1_vector(gb, sbr->data[0].bs_add_harmonic, sbr->n[1]);
876
877 return 0;
876 } 878 }
877 879
878 static int read_sbr_channel_pair_element(AACContext *ac, 880 static int read_sbr_channel_pair_element(AACContext *ac,
879 SpectralBandReplication *sbr, 881 SpectralBandReplication *sbr,
880 GetBitContext *gb) 882 GetBitContext *gb)
911 913
912 if ((sbr->data[0].bs_add_harmonic_flag = get_bits1(gb))) 914 if ((sbr->data[0].bs_add_harmonic_flag = get_bits1(gb)))
913 get_bits1_vector(gb, sbr->data[0].bs_add_harmonic, sbr->n[1]); 915 get_bits1_vector(gb, sbr->data[0].bs_add_harmonic, sbr->n[1]);
914 if ((sbr->data[1].bs_add_harmonic_flag = get_bits1(gb))) 916 if ((sbr->data[1].bs_add_harmonic_flag = get_bits1(gb)))
915 get_bits1_vector(gb, sbr->data[1].bs_add_harmonic, sbr->n[1]); 917 get_bits1_vector(gb, sbr->data[1].bs_add_harmonic, sbr->n[1]);
918
919 return 0;
916 } 920 }
917 921
918 static unsigned int read_sbr_data(AACContext *ac, SpectralBandReplication *sbr, 922 static unsigned int read_sbr_data(AACContext *ac, SpectralBandReplication *sbr,
919 GetBitContext *gb, int id_aac) 923 GetBitContext *gb, int id_aac)
920 { 924 {