mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-27 13:10:37 +00:00
Fix various if parenthesis misplacements.
This commit is contained in:
parent
4931c8f0f1
commit
2f0f9a87d0
@ -173,7 +173,7 @@ int main(int argc, char **argv)
|
|||||||
av_register_all();
|
av_register_all();
|
||||||
avfilter_register_all();
|
avfilter_register_all();
|
||||||
|
|
||||||
if ((ret = open_input_file(argv[1]) < 0))
|
if ((ret = open_input_file(argv[1])) < 0)
|
||||||
goto end;
|
goto end;
|
||||||
if ((ret = init_filters(filter_descr)) < 0)
|
if ((ret = init_filters(filter_descr)) < 0)
|
||||||
goto end;
|
goto end;
|
||||||
|
@ -1442,7 +1442,7 @@ static int decode_frame(AVCodecContext *avctx,
|
|||||||
ctx->cur_frame_length = sconf->frame_length;
|
ctx->cur_frame_length = sconf->frame_length;
|
||||||
|
|
||||||
// decode the frame data
|
// decode the frame data
|
||||||
if ((invalid_frame = read_frame_data(ctx, ra_frame) < 0))
|
if ((invalid_frame = read_frame_data(ctx, ra_frame)) < 0)
|
||||||
av_log(ctx->avctx, AV_LOG_WARNING,
|
av_log(ctx->avctx, AV_LOG_WARNING,
|
||||||
"Reading frame data failed. Skipping RA unit.\n");
|
"Reading frame data failed. Skipping RA unit.\n");
|
||||||
|
|
||||||
|
@ -634,11 +634,11 @@ static int v4l2_read_header(AVFormatContext *s1, AVFormatParameters *ap)
|
|||||||
res = AVERROR(EIO);
|
res = AVERROR(EIO);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
if ((res = av_image_check_size(s->width, s->height, 0, s1) < 0))
|
if ((res = av_image_check_size(s->width, s->height, 0, s1)) < 0)
|
||||||
goto out;
|
goto out;
|
||||||
s->frame_format = desired_format;
|
s->frame_format = desired_format;
|
||||||
|
|
||||||
if ((res = v4l2_set_parameters(s1, ap) < 0))
|
if ((res = v4l2_set_parameters(s1, ap)) < 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);
|
st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id);
|
||||||
|
@ -359,7 +359,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
|
|||||||
load_glyph(ctx, NULL, 0);
|
load_glyph(ctx, NULL, 0);
|
||||||
|
|
||||||
/* set the tabsize in pixels */
|
/* set the tabsize in pixels */
|
||||||
if ((err = load_glyph(ctx, &glyph, ' ') < 0)) {
|
if ((err = load_glyph(ctx, &glyph, ' ')) < 0) {
|
||||||
av_log(ctx, AV_LOG_ERROR, "Could not set tabsize.\n");
|
av_log(ctx, AV_LOG_ERROR, "Could not set tabsize.\n");
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ static int request_frame(AVFilterLink *outlink)
|
|||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!fifo->root.next) {
|
if (!fifo->root.next) {
|
||||||
if ((ret = avfilter_request_frame(outlink->src->inputs[0]) < 0))
|
if ((ret = avfilter_request_frame(outlink->src->inputs[0])) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -442,7 +442,7 @@ static int wav_read_header(AVFormatContext *s,
|
|||||||
switch (tag) {
|
switch (tag) {
|
||||||
case MKTAG('f', 'm', 't', ' '):
|
case MKTAG('f', 'm', 't', ' '):
|
||||||
/* only parse the first 'fmt ' tag found */
|
/* only parse the first 'fmt ' tag found */
|
||||||
if (!got_fmt && (ret = wav_parse_fmt_tag(s, size, &st) < 0)) {
|
if (!got_fmt && (ret = wav_parse_fmt_tag(s, size, &st)) < 0) {
|
||||||
return ret;
|
return ret;
|
||||||
} else if (got_fmt)
|
} else if (got_fmt)
|
||||||
av_log(s, AV_LOG_WARNING, "found more than one 'fmt ' tag\n");
|
av_log(s, AV_LOG_WARNING, "found more than one 'fmt ' tag\n");
|
||||||
|
Loading…
Reference in New Issue
Block a user