diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
index 751aff5794..56cc4af916 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/video/MediaCodecVideoRenderer.java
@@ -682,7 +682,10 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
         break;
       case MSG_SET_VIDEO_OUTPUT_RESOLUTION:
         Size outputResolution = (Size) checkNotNull(message);
-        if (displaySurface != null && frameProcessorManager.isEnabled()) {
+        if (outputResolution.getWidth() != 0
+            && outputResolution.getHeight() != 0
+            && displaySurface != null
+            && frameProcessorManager.isEnabled()) {
           frameProcessorManager.setOutputSurfaceInfo(displaySurface, outputResolution);
         }
         break;
@@ -2047,6 +2050,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
       checkNotNull(frameProcessor).setOutputSurfaceInfo(null);
       currentSurfaceAndSize = null;
     }
+
     /**
      * Sets the input surface info.
      *