[FFmpeg-cvslog] swscale: make handle_formats() safe to be called multiple times

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jul 14 03:33:48 2013 +0200| [0fc11e7bad7190080dc75aaec82ee66f4037359d] | committer: Michael Niedermayer

swscale: make handle_formats() safe to be called multiple times

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fc11e7bad7190080dc75aaec82ee66f4037359d
---

 libswscale/utils.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libswscale/utils.c b/libswscale/utils.c
index 5c40f00..2e89a2d 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1043,10 +1043,10 @@ static int handle_xyz(enum AVPixelFormat *format)
 
 static void handle_formats(SwsContext *c)
 {
-    c->src0Alpha = handle_0alpha(&c->srcFormat);
-    c->dst0Alpha = handle_0alpha(&c->dstFormat);
-    c->srcXYZ    = handle_xyz(&c->srcFormat);
-    c->dstXYZ    = handle_xyz(&c->dstFormat);
+    c->src0Alpha |= handle_0alpha(&c->srcFormat);
+    c->dst0Alpha |= handle_0alpha(&c->dstFormat);
+    c->srcXYZ    |= handle_xyz(&c->srcFormat);
+    c->dstXYZ    |= handle_xyz(&c->dstFormat);
 }
 
 SwsContext *sws_alloc_context(void)