[FFmpeg-cvslog] Support muxing 4k AVC Intra in mov.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Tue Dec  2 23:35:40 2014 +0100| [7a4be4315fd6c5e80cd24697d1a5b67c9a3cfcaf] | committer: Carl Eugen Hoyos

Support muxing 4k AVC Intra in mov.

Reported and tested by Rens Dijkshoorn, rens onlinemedia nl

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a4be4315fd6c5e80cd24697d1a5b67c9a3cfcaf
---

 libavformat/isom.h   |    1 +
 libavformat/movenc.c |    3 +++
 2 files changed, 4 insertions(+)

diff --git a/libavformat/isom.h b/libavformat/isom.h
index 074837f..e3160d0 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -246,6 +246,7 @@ void ff_mp4_parse_es_descr(AVIOContext *pb, int *es_id);
      (tag) == MKTAG('a', 'i', '1', '3') ||  \
      (tag) == MKTAG('a', 'i', '1', '5') ||  \
      (tag) == MKTAG('a', 'i', '1', '6') ||  \
+     (tag) == MKTAG('a', 'i', 'v', 'x') ||  \
      (tag) == MKTAG('A', 'V', 'i', 'n'))
 
 
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 6e51424..10e883c 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1278,6 +1278,9 @@ static int mov_get_h264_codec_tag(AVFormatContext *s, MOVTrack *track)
                 else if (rate == 50) tag = MKTAG('a','i','1','5');
                 else if (rate == 60) tag = MKTAG('a','i','1','6');
             }
+        } else if (   track->enc->width == 4096 && track->enc->height == 2160
+                   || track->enc->width == 3840 && track->enc->height == 2160) {
+            tag = MKTAG('a','i','v','x');
         }
     }