diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-24 20:26:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-24 20:26:48 +0200 |
| commit | bd4640375e24fc0aa8846d9ee42cebe3c1fa9c12 (patch) | |
| tree | 9d3f2f97610a982d9d259247a95f20ebe3428dda /avconv.c | |
| parent | d4f30c7daf1cf82e78fd7c3d2ea0f56b4c582abd (diff) | |
| parent | b9630bcf8215034f5a50e1f6835d4c4366413618 (diff) | |
| download | ffmpeg-bd4640375e24fc0aa8846d9ee42cebe3c1fa9c12.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avconv: Replace goto redo on decode fail with continue.
avconv: Remove dead store.
libx264: add 'crf_max' private option.
libx264: add 'weightp' private option.
libx264: add 'rc_lookahead' private option.
libx264: add 'psy_trellis' private option.
libx264: add 'psy_rd' private option.
libx264: add 'aq_strength' private option.
libx264: add 'aq_mode' private option.
libx264: add 'cqp' private option.
libx264: add 'crf' private option.
lavc: remove vbv_delay option
lavf utils: Fix bad indentation.
avconv: use av_clip_int16 for audio clipping
Conflicts:
libavcodec/libx264.c
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'avconv.c')
| -rw-r--r-- | avconv.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1687,7 +1687,6 @@ static int output_packet(InputStream *ist, int ist_index, } break; } - ret = avpkt.size; avpkt.size = 0; } @@ -1698,9 +1697,7 @@ static int output_packet(InputStream *ist, int ist_index, volp = samples; for(i=0;i<(decoded_data_size / sizeof(short));i++) { int v = ((*volp) * audio_volume + 128) >> 8; - if (v < -32768) v = -32768; - if (v > 32767) v = 32767; - *volp++ = v; + *volp++ = av_clip_int16(v); } } } @@ -2307,7 +2304,6 @@ static int transcode(OutputFile *output_files, int64_t ipts_min; double opts_min; - redo: ipts_min = INT64_MAX; opts_min= 1e100; /* if 'q' pressed, exits */ @@ -2473,7 +2469,7 @@ static int transcode(OutputFile *output_files, if (exit_on_error) exit_program(1); av_free_packet(&pkt); - goto redo; + continue; } discard_packet: |