videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-05 18:59:59 +02:00
Code Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  avfiltergraph: check for sws opts being non-NULL before using them.

Conflicts:
	libavfilter/avfiltergraph.c
	libavfilter/graphparser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-03 15:20:05 +02:00
commit d3fc2db47e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavfilter/avfiltergraph.c
View File

@ -23,6 +23,7 @@
#include <string.h>
#include "libavutil/avassert.h"
#include "libavutil/avstring.h"
#include "libavutil/bprint.h"
#include "libavutil/channel_layout.h"
#include "libavutil/opt.h"
@ -340,11 +341,11 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
snprintf(inst_name, sizeof(inst_name), "auto-inserted scaler %d",
scaler_count++);
if (graph->scale_sws_opts)
snprintf(scale_args, sizeof(scale_args), "0:0:%s", graph->scale_sws_opts);
else
snprintf(scale_args, sizeof(scale_args), "0:0");
av_strlcpy(scale_args, "0:0", sizeof(scale_args));
if (graph->scale_sws_opts) {
av_strlcat(scale_args, ":", sizeof(scale_args));
av_strlcat(scale_args, graph->scale_sws_opts, sizeof(scale_args));
}
if ((ret = avfilter_graph_create_filter(&convert, filter,
inst_name, scale_args, NULL,
graph)) < 0)

4
libavfilter/graphparser.c
View File

@ -122,8 +122,8 @@ static int create_filter(AVFilterContext **filt_ctx, AVFilterGraph *ctx, int ind
return ret;
}
if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags")
&& ctx->scale_sws_opts) {
if (!strcmp(filt_name, "scale") && args && !strstr(args, "flags") &&
ctx->scale_sws_opts) {
snprintf(tmp_args, sizeof(tmp_args), "%s:%s",
args, ctx->scale_sws_opts);
args = tmp_args;