RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-19 05:55:07 +00:00
Code Issues Projects Releases Wiki Activity

Support muxing 4k AVC Intra in mov.

Browse Source 
Reported and tested by Rens Dijkshoorn, rens onlinemedia nl
This commit is contained in:
Carl Eugen Hoyos 2014-12-02 23:35:40 +01:00
parent ebc29e8625
commit 7a4be4315f
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavformat/isom.h
View File

@ -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'))

3
libavformat/movenc.c
View File

@ -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');
}
}