summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/imgresample.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2007-01-28 18:38:32 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2007-01-28 18:38:32 +0000
commit7c3728d769962d288b73cc945c3143ae68726984 (patch)
tree36f762f4ce762a77ed0333711f628c40ba1a0f98 /src/libffmpeg/libavcodec/imgresample.c
parent9add5e858c10b369eb44fe7ab618efb37eb3c585 (diff)
downloadxine-lib-7c3728d769962d288b73cc945c3143ae68726984.tar.gz
xine-lib-7c3728d769962d288b73cc945c3143ae68726984.tar.bz2
another ffmpeg sync to include h264 security fixes
CVS patchset: 8573 CVS date: 2007/01/28 18:38:32
Diffstat (limited to 'src/libffmpeg/libavcodec/imgresample.c')
-rw-r--r--src/libffmpeg/libavcodec/imgresample.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libffmpeg/libavcodec/imgresample.c b/src/libffmpeg/libavcodec/imgresample.c
index ce1a05ce4..adcfd0481 100644
--- a/src/libffmpeg/libavcodec/imgresample.c
+++ b/src/libffmpeg/libavcodec/imgresample.c
@@ -672,6 +672,8 @@ struct SwsContext *sws_getContext(int srcW, int srcH, int srcFormat,
void sws_freeContext(struct SwsContext *ctx)
{
+ if (!ctx)
+ return;
if ((ctx->resampling_ctx->iwidth != ctx->resampling_ctx->owidth) ||
(ctx->resampling_ctx->iheight != ctx->resampling_ctx->oheight)) {
img_resample_close(ctx->resampling_ctx);