aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXi Wang <xi.wang@gmail.com>2013-01-04 21:15:33 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2013-01-04 20:44:00 -0500
commitf73f76fd202b310e8e1d0215b2e0cf038cd18c4a (patch)
treebc570a8840022281eec20d007e124a7a5f29d17a
parent3b81bba3bc5aca98d891cb377d27566de4745225 (diff)
downloadffmpeg-f73f76fd202b310e8e1d0215b2e0cf038cd18c4a.tar.gz
swscale: fix NULL checking in sws_alloc_context()
sws_getCachedContext() and sws_getContext() expect sws_alloc_context() to return NULL when out of memory, as follows. if (!(context = sws_alloc_context())) return NULL; This patch fixes sws_alloc_context() to return NULL in that case. Signed-off-by: Xi Wang <xi.wang@gmail.com> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
-rw-r--r--libswscale/utils.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index e5e4d60dd2..f0a2b464fc 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -844,8 +844,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;
}