RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

swr-test: remove 0 terminator in layouts for consistency 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-26 10:35:45 +02:00
parent b1519102f1
commit 69f3af9590
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libswresample/swresample_test.c
View File

@ -117,7 +117,6 @@ uint64_t layouts[]={
AV_CH_LAYOUT_7POINT0 , AV_CH_LAYOUT_7POINT0 ,
AV_CH_LAYOUT_7POINT1 , AV_CH_LAYOUT_7POINT1 ,
AV_CH_LAYOUT_7POINT1_WIDE , AV_CH_LAYOUT_7POINT1_WIDE ,
0
}; };
static void setup_array(uint8_t *out[SWR_CH_MAX], uint8_t *in, enum AVSampleFormat format, int samples){ static void setup_array(uint8_t *out[SWR_CH_MAX], uint8_t *in, enum AVSampleFormat format, int samples){
@ -154,11 +153,11 @@ int main(int argc, char **argv){
out_sample_rate= rates[osr]; out_sample_rate= rates[osr];
for(in_sample_fmt= AV_SAMPLE_FMT_U8; in_sample_fmt<=AV_SAMPLE_FMT_DBL; in_sample_fmt++){ for(in_sample_fmt= AV_SAMPLE_FMT_U8; in_sample_fmt<=AV_SAMPLE_FMT_DBL; in_sample_fmt++){
for(out_sample_fmt= AV_SAMPLE_FMT_U8; out_sample_fmt<=AV_SAMPLE_FMT_DBL; out_sample_fmt++){ for(out_sample_fmt= AV_SAMPLE_FMT_U8; out_sample_fmt<=AV_SAMPLE_FMT_DBL; out_sample_fmt++){
for(in_ch_layout_index=0; layouts[in_ch_layout_index]; in_ch_layout_index++){ for(in_ch_layout_index=0; in_ch_layout_index < FF_ARRAY_ELEMS(layouts); in_ch_layout_index++){
int in_ch_count; int in_ch_count;
in_ch_layout= layouts[in_ch_layout_index]; in_ch_layout= layouts[in_ch_layout_index];
in_ch_count= av_get_channel_layout_nb_channels(in_ch_layout); in_ch_count= av_get_channel_layout_nb_channels(in_ch_layout);
for(out_ch_layout_index=0; layouts[out_ch_layout_index]; out_ch_layout_index++){ for(out_ch_layout_index=0; out_ch_layout_index < FF_ARRAY_ELEMS(layouts); out_ch_layout_index++){
int out_count, mid_count, out_ch_count; int out_count, mid_count, out_ch_count;
out_ch_layout= layouts[out_ch_layout_index]; out_ch_layout= layouts[out_ch_layout_index];
out_ch_count= av_get_channel_layout_nb_channels(out_ch_layout); out_ch_count= av_get_channel_layout_nb_channels(out_ch_layout);