commit 6178e86a7415507219e541a2c78b22ed9b3dad71
author Michael Stefaniuc <mstefani@redhat.de> Tue May 18 01:31:01 2010 +0200
committer Alexandre Julliard <julliard@winehq.org> Tue May 18 18:42:07 2010 +0200
tree 45edd99c3e6b5e409295d289bccf21cb44727b8a
parent 989e98202f199e1b351a514f79a0f2ac1c1beebd

avifil32: Remove some redundant "not NULL" checks (coccicheck).

dlls/avifil32/api.c

diff --git a/dlls/avifil32/api.c b/dlls/avifil32/api.c
index ac3c35e..8ef75d3 100644
--- a/dlls/avifil32/api.c
+++ b/dlls/avifil32/api.c
@@ -1447,7 +1447,7 @@
     return AVIERR_BADPARAM;
 
   /* save options in case the user presses cancel */
-  if (ppOptions != NULL && nStreams > 1) {
+  if (nStreams > 1) {
     pSavedOptions = HeapAlloc(GetProcessHeap(), 0, nStreams * sizeof(AVICOMPRESSOPTIONS));
     if (pSavedOptions == NULL)
       return FALSE;
@@ -1629,7 +1629,7 @@
       /* remember first video stream -- needed for interleaving */
       if (lFirstVideo < 0)
 	lFirstVideo = curStream;
-    } else if (!dwInterleave && plpOptions != NULL) {
+    } else if (!dwInterleave) {
       /* check if any non-video stream wants to be interleaved */
       WARN("options.flags=0x%X options.dwInterleave=%u\n",plpOptions[curStream]->dwFlags,plpOptions[curStream]->dwInterleaveEvery);
       if (plpOptions[curStream] != NULL &&
@@ -1639,7 +1639,7 @@
 
     /* create de-/compressed stream interface if needed */
     pInStreams[curStream] = NULL;
-    if (plpOptions != NULL && plpOptions[curStream] != NULL) {
+    if (plpOptions[curStream] != NULL) {
       if (plpOptions[curStream]->fccHandler ||
 	  plpOptions[curStream]->lpFormat != NULL) {
 	DWORD dwKeySave = plpOptions[curStream]->dwKeyFrameEvery;