generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vf_mp: do not add duplicated pixel formats.

Browse Source 
This avoid a crash with in avfilter_merge_formats() in case one of the
filter formats list has multiple time the same entry.

Thanks to Mina Nagy Zaki for helping figuring out the issue.
This commit is contained in:
Clément Bœsch 2011-06-22 10:33:01 +02:00 committed by Clément Bœsch
parent f4228097e4
commit c9584f0c9c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_mp.c
View File

@ -41,6 +41,7 @@
//FIXME maybe link the orig in //FIXME maybe link the orig in
//XXX: identical pix_fmt must be following with each others
static const struct { static const struct {
int fmt; int fmt;
enum PixelFormat pix_fmt; enum PixelFormat pix_fmt;
@ -785,13 +786,17 @@ static int query_formats(AVFilterContext *ctx)
{ {
AVFilterFormats *avfmts=NULL; AVFilterFormats *avfmts=NULL;
MPContext *m = ctx->priv; MPContext *m = ctx->priv;
enum PixelFormat lastpixfmt = PIX_FMT_NONE;
int i; int i;
for(i=0; conversion_map[i].fmt; i++){ for(i=0; conversion_map[i].fmt; i++){
av_log(ctx, AV_LOG_DEBUG, "query: %X\n", conversion_map[i].fmt); av_log(ctx, AV_LOG_DEBUG, "query: %X\n", conversion_map[i].fmt);
if(m->vf.query_format(&m->vf, conversion_map[i].fmt)){ if(m->vf.query_format(&m->vf, conversion_map[i].fmt)){
av_log(ctx, AV_LOG_DEBUG, "supported,adding\n"); av_log(ctx, AV_LOG_DEBUG, "supported,adding\n");
if (conversion_map[i].pix_fmt != lastpixfmt) {
avfilter_add_format(&avfmts, conversion_map[i].pix_fmt); avfilter_add_format(&avfmts, conversion_map[i].pix_fmt);
lastpixfmt = conversion_map[i].pix_fmt;
}
} }
} }