diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-09 21:12:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-13 22:32:21 +0200 |
| commit | 52c85b194b2d240495a5c0476221898e67dedbeb (patch) | |
| tree | 46b0f3cb8ad40d3681c0ddc69b25c30b144fd30f | |
| parent | 8407cbbfc942343d562d5960f3b85938db49fac7 (diff) | |
| download | ffmpeg-52c85b194b2d240495a5c0476221898e67dedbeb.tar.gz | |
avdevice/lavfi: dont assign variables to themselfs
Fixes "warning: explicitly assigning a variable of type int to itself"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavdevice/lavfi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 4cfe804c32..1398ece508 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -119,7 +119,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) AVIOContext *avio = NULL; ret = avio_open(&avio, lavfi->graph_filename, AVIO_FLAG_READ); if (ret < 0) - FAIL(ret); + goto end; av_bprint_init(&graph_file_pb, 0, AV_BPRINT_SIZE_UNLIMITED); ret = avio_read_to_bprint(avio, &graph_file_pb, INT_MAX); avio_close(avio); @@ -128,10 +128,10 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) ret = AVERROR(ENOMEM); if (ret) { av_bprint_finalize(&graph_file_pb, NULL); - FAIL(ret); + goto end; } if ((ret = av_bprint_finalize(&graph_file_pb, &lavfi->graph_str))) - FAIL(ret); + goto end; } if (!lavfi->graph_str) @@ -143,7 +143,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) if ((ret = avfilter_graph_parse_ptr(lavfi->graph, lavfi->graph_str, &input_links, &output_links, avctx)) < 0) - FAIL(ret); + goto end; if (input_links) { av_log(avctx, AV_LOG_ERROR, @@ -252,12 +252,12 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) lavfi->sinks[i] = sink; if ((ret = avfilter_link(inout->filter_ctx, inout->pad_idx, sink, 0)) < 0) - FAIL(ret); + goto end; } /* configure the graph */ if ((ret = avfilter_graph_config(lavfi->graph, avctx)) < 0) - FAIL(ret); + goto end; if (lavfi->dump_graph) { char *dump = avfilter_graph_dump(lavfi->graph, lavfi->dump_graph); |