ffmpeg-git Apple Quicktime patch (timebase issue; bug #5882)

diff -uNr -U 6 ffmpeg-git-orig/libavformat/movenc.c ffmpeg-git/libavformat/movenc.c
--- ffmpeg-git-orig/libavformat/movenc.c    2016-10-11 10:42:02.599749985 -0400
+++ ffmpeg-git/libavformat/movenc.c 2016-10-11 10:44:28.004413547 -0400
@@ -5669,22 +5669,26 @@
                 track->timescale = mov->video_track_timescale;
             } else {
                 track->timescale = st->time_base.den;
                 while(track->timescale < 10000)
                     track->timescale *= 2;
             }
+            if (track->timescale > 100000) {
+                unsigned int timescale_new = (unsigned int)((double)(st->time_base.den)
+                * 1000 / (double)(st->time_base.num));
+                av_log(s, AV_LOG_WARNING,
+                       "WARNING codec timebase is very high. If duration is too long,\n"
+                       "file may not be playable by Apple Quicktime. Auto-setting\n"
+                       "a shorter timebase %u instead of %d.\n", timescale_new, track->timescale);
+                track->timescale = timescale_new;
+            }
             if (st->codecpar->width > 65535 || st->codecpar->height > 65535) {
                 av_log(s, AV_LOG_ERROR, "Resolution %dx%d too large for mov/mp4\n", st->codecpar->width, st->codecpar->height);
                 ret = AVERROR(EINVAL);
                 goto error;
             }
-            if (track->mode == MODE_MOV && track->timescale > 100000)
-                av_log(s, AV_LOG_WARNING,
-                       "WARNING codec timebase is very high. If duration is too long,\n"
-                       "file may not be playable by quicktime. Specify a shorter timebase\n"
-                       "or choose different container.\n");
             if (track->mode == MODE_MOV &&
                 track->par->codec_id == AV_CODEC_ID_RAWVIDEO &&
                 track->tag == MKTAG('r','a','w',' ')) {
                 enum AVPixelFormat pix_fmt = track->par->format;
                 if (pix_fmt == AV_PIX_FMT_NONE && track->par->bits_per_coded_sample == 1)
                     pix_fmt = AV_PIX_FMT_MONOWHITE;