virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Be more consistent in style of code for falling back to defaults.

Browse Source 
Commited in SoC by Bobby Bingham on 2007-08-17 23:16:38

Originally committed as revision 12012 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-02-15 21:38:17 +00:00
parent cdf2a3326f
commit e675dccdc0
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/avfilter.c
View File

@ -97,16 +97,16 @@ int avfilter_config_link(AVFilterLink *link)
{
int *fmts[2], i, j;
int (*config_link)(AVFilterLink *);
int *(*query_formats)(AVFilterLink *link);
if(!link)
return 0;
/* find a format both filters support - TODO: auto-insert conversion filter */
link->format = -1;
if(link_spad(link).query_formats)
fmts[0] = link_spad(link).query_formats(link);
else
fmts[0] = avfilter_default_query_output_formats(link);
if(!(query_formats = link_spad(link).query_formats))
query_formats = avfilter_default_query_output_formats;
fmts[0] = query_formats(link);
fmts[1] = link_dpad(link).query_formats(link);
for(i = 0; fmts[0][i] != -1; i ++)
for(j = 0; fmts[1][j] != -1; j ++)
@ -162,8 +162,7 @@ void avfilter_start_frame(AVFilterLink *link, AVFilterPicRef *picref)
{
void (*start_frame)(AVFilterLink *, AVFilterPicRef *);
start_frame = link_dpad(link).start_frame;
if(!start_frame)
if(!(start_frame = link_dpad(link).start_frame))
start_frame = avfilter_default_start_frame;
/* prepare to copy the picture if it has insufficient permissions */
@ -194,8 +193,7 @@ void avfilter_end_frame(AVFilterLink *link)
link->srcpic = NULL;
}
end_frame = link_dpad(link).end_frame;
if(!end_frame)
if(!(end_frame = link_dpad(link).end_frame))
end_frame = avfilter_default_end_frame;
end_frame(link);