Mercurial > mplayer.hg
comparison libao2/ao_alsa.c @ 28118:4455edd2be89
100l, reorder check for AC3 format to avoid a possible memleak
| author | reimar |
|---|---|
| date | Mon, 15 Dec 2008 20:19:27 +0000 |
| parents | 8dec0335f75b |
| children | e45b08f2f5d3 |
comparison
equal
deleted
inserted
replaced
| 28117:bd6833421e56 | 28118:4455edd2be89 |
|---|---|
| 117 | 117 |
| 118 long pmin, pmax; | 118 long pmin, pmax; |
| 119 long get_vol, set_vol; | 119 long get_vol, set_vol; |
| 120 float f_multi; | 120 float f_multi; |
| 121 | 121 |
| 122 if(ao_data.format == AF_FORMAT_AC3) | |
| 123 return CONTROL_TRUE; | |
| 124 | |
| 122 if(mixer_channel) { | 125 if(mixer_channel) { |
| 123 char *test_mix_index; | 126 char *test_mix_index; |
| 124 | 127 |
| 125 mix_name = strdup(mixer_channel); | 128 mix_name = strdup(mixer_channel); |
| 126 if ((test_mix_index = strchr(mix_name, ','))){ | 129 if ((test_mix_index = strchr(mix_name, ','))){ |
| 134 mix_index = 0 ; | 137 mix_index = 0 ; |
| 135 } | 138 } |
| 136 } | 139 } |
| 137 } | 140 } |
| 138 if(mixer_device) card = mixer_device; | 141 if(mixer_device) card = mixer_device; |
| 139 | |
| 140 if(ao_data.format == AF_FORMAT_AC3) | |
| 141 return CONTROL_TRUE; | |
| 142 | 142 |
| 143 //allocate simple id | 143 //allocate simple id |
| 144 snd_mixer_selem_id_alloca(&sid); | 144 snd_mixer_selem_id_alloca(&sid); |
| 145 | 145 |
| 146 //sets simple-mixer index and name | 146 //sets simple-mixer index and name |