Browse Source

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: fix NULL checking in sws_alloc_context()
  mxfdec: fix NULL checking in mxf_get_sorted_table_segments()
  finalize changelog for version 9

Conflicts:
	Changelog
	libavformat/mxfdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 12 years ago
parent
commit
bb4fb7715c
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      libswscale/utils.c

+ 4
- 2
libswscale/utils.c View File

@@ -888,8 +888,10 @@ SwsContext *sws_alloc_context(void)
{
SwsContext *c = av_mallocz(sizeof(SwsContext));

c->av_class = &sws_context_class;
av_opt_set_defaults(c);
if (c) {
c->av_class = &sws_context_class;
av_opt_set_defaults(c);
}

return c;
}


Loading…
Cancel
Save