diff --git a/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java b/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
index cc67f036cb77163b1a302037e0128bbfad05db25..fb136155b46ef26ff75058345438d7be242d2b54 100644
--- a/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
+++ b/src/main/java/org/olat/modules/video/ui/VideoAdminTranscodingController.java
@@ -137,9 +137,9 @@ public class VideoAdminTranscodingController extends FormBasicController {
 			for (OLATResource videoResource : nativeResolutions.keySet()) {
 				if (nativeResolutions.get(videoResource) >= fixresolution[i]) counter++;
 			}
-			int Scount = successCount.get(fixresolution[i]) != null ? successCount.get(fixresolution[i]) : 0;
-			int Fcount = failCount.get(fixresolution[i]) != null ? failCount.get(fixresolution[i]) : 0;
-			TranscodingRow transcodingRow = new TranscodingRow(fixresolution[i], Scount, Fcount, counter, mayTranscode(fixresolution[i])); 
+			int success = successCount.get(fixresolution[i]) != null ? successCount.get(fixresolution[i]) : 0;
+			int fails = failCount.get(fixresolution[i]) != null ? failCount.get(fixresolution[i]) : 0;
+			TranscodingRow transcodingRow = new TranscodingRow(fixresolution[i], success, fails, counter, mayTranscode(fixresolution[i])); 
 			resolutions.add(transcodingRow);
 		}
 		if (resolutions != null){
diff --git a/src/main/java/org/olat/repository/handlers/VideoHandler.java b/src/main/java/org/olat/repository/handlers/VideoHandler.java
index 75587262be9dbda81684a6c3b4a85810cc8a6423..72880b1d36e676f1b40ab0f56cefdac835d0b8e2 100644
--- a/src/main/java/org/olat/repository/handlers/VideoHandler.java
+++ b/src/main/java/org/olat/repository/handlers/VideoHandler.java
@@ -125,7 +125,7 @@ public class VideoHandler extends FileHandler {
 		long filesize = importFile.getSize();
 		VideoManager videoManager = CoreSpringFactory.getImpl(VideoManager.class);
 
-		if (fileName.endsWith(".mp4")|| fileName.endsWith(".mov")) {
+		if (fileName.endsWith(".mp4") || fileName.endsWith(".mov") || fileName.endsWith(".m4v")) {
 			// 2a) import video from raw mp4 master video file
 			videoManager.importFromMasterFile(repoEntry, importFile);