Commit daf98908 authored by Alex Converse's avatar Alex Converse

avconv: Reformat s16 volume adjustment.

parent baf6b738
...@@ -1676,13 +1676,12 @@ static int output_packet(InputStream *ist, int ist_index, ...@@ -1676,13 +1676,12 @@ static int output_packet(InputStream *ist, int ist_index,
} }
case AV_SAMPLE_FMT_S16: case AV_SAMPLE_FMT_S16:
{ {
short *volp; int16_t *volp = samples;
volp = samples; for (i = 0; i < (decoded_data_size / sizeof(*volp)); i++) {
for(i=0;i<(decoded_data_size / sizeof(short));i++) { int v = ((*volp) * audio_volume + 128) >> 8;
int v = ((*volp) * audio_volume + 128) >> 8; *volp++ = av_clip_int16(v);
*volp++ = av_clip_int16(v); }
} break;
break;
} }
case AV_SAMPLE_FMT_S32: case AV_SAMPLE_FMT_S32:
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment