diff --git a/src/TrackArtist.cpp b/src/TrackArtist.cpp
index b15c5db9f..941c5ce01 100644
--- a/src/TrackArtist.cpp
+++ b/src/TrackArtist.cpp
@@ -471,6 +471,8 @@ void TrackArtist::DrawTrack(const Track * t,
       case WaveTrack::Spectrum:
          DrawSpectrum(wt, dc, rect, selectedRegion, zoomInfo);
          break;
+      default:
+         wxASSERT(false);
       }
 
 #if defined(__WXMAC__)
diff --git a/src/export/ExportFFmpeg.cpp b/src/export/ExportFFmpeg.cpp
index f310d1e09..c1f577f36 100644
--- a/src/export/ExportFFmpeg.cpp
+++ b/src/export/ExportFFmpeg.cpp
@@ -589,6 +589,12 @@ static int encode_audio(AVCodecContext *avctx, AVPacket *pkt, int16_t *audio_sam
             case AV_SAMPLE_FMT_FLTP:
                ((float*)(frame->data[ch]))[i] = audio_samples[ch + i*avctx->channels] / 32767.;
                break;
+            case AV_SAMPLE_FMT_NONE:
+            case AV_SAMPLE_FMT_DBL:
+            case AV_SAMPLE_FMT_DBLP:
+            case AV_SAMPLE_FMT_NB:
+               wxASSERT(false);
+               break;
             }
          }
       }
diff --git a/src/import/ImportFLAC.cpp b/src/import/ImportFLAC.cpp
index 4c22afd6b..2003456b1 100644
--- a/src/import/ImportFLAC.cpp
+++ b/src/import/ImportFLAC.cpp
@@ -215,6 +215,9 @@ void MyFLACFile::metadata_callback(const FLAC__StreamMetadata *metadata)
       case FLAC__METADATA_TYPE_PICTURE:		// ignore pictures
       case FLAC__METADATA_TYPE_UNDEFINED:	// do nothing with this either
       break;
+
+      case FLAC__MAX_METADATA_TYPE: // suppress compiler warning
+         wxASSERT(false);
    }
 }
 
diff --git a/src/ondemand/ODDecodeFlacTask.cpp b/src/ondemand/ODDecodeFlacTask.cpp
index b42fffa1d..7b2277d8c 100644
--- a/src/ondemand/ODDecodeFlacTask.cpp
+++ b/src/ondemand/ODDecodeFlacTask.cpp
@@ -79,6 +79,9 @@ void ODFLACFile::metadata_callback(const FLAC__StreamMetadata *metadata)
       case FLAC__METADATA_TYPE_PICTURE:		// ignore pictures
       case FLAC__METADATA_TYPE_UNDEFINED:	// do nothing with this either
       break;
+
+      case FLAC__MAX_METADATA_TYPE: // suppress compiler warning
+         break;
    }
 }