From 03a857f59a773483924a942ac3bda1b290f82a2e Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 6 Mar 2017 00:30:03 +0100
Subject: [PATCH] Use more widely supported MP4 format for gifv's

---
 app/models/media_attachment.rb  | 12 +++++++-----
 lib/paperclip/gif_transcoder.rb |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 5241d9515..1090f1b39 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -59,13 +59,15 @@ class MediaAttachment < ApplicationRecord
         {
           small: IMAGE_STYLES[:small],
           original: {
-            format: 'webm',
+            format: 'mp4',
             convert_options: {
               output: {
-                'c:v'   => 'libvpx',
-                'crf'   => 4,
-                'b:v'   => '1300K',
-                'vsync' => 'cfr',
+                'movflags' => 'faststart',
+                'pix_fmt'  => 'yuv420p',
+                'vf'       => 'scale=\'trunc(iw/2)*2:trunc(ih/2)*2\'',
+                'vsync'    => 'cfr',
+                'b:v'      => '1300K',
+                'crf'      => 4,
               },
             },
           },
diff --git a/lib/paperclip/gif_transcoder.rb b/lib/paperclip/gif_transcoder.rb
index 33d2c4a01..8337448b2 100644
--- a/lib/paperclip/gif_transcoder.rb
+++ b/lib/paperclip/gif_transcoder.rb
@@ -11,8 +11,8 @@ module Paperclip
 
       final_file = Paperclip::Transcoder.make(file, options, attachment)
 
-      attachment.instance.file_file_name    = 'media.webm'
-      attachment.instance.file_content_type = 'video/webm'
+      attachment.instance.file_file_name    = 'media.mp4'
+      attachment.instance.file_content_type = 'video/mp4'
       attachment.instance.type              = MediaAttachment.types[:gifv]
 
       final_file