RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730' 

* commit 'f1eac2b8a0370b908cd691086d11f51342054730':
  movenc: Use keyframes as default fragmentation point in ismv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-23 12:33:08 +02:00
parent d4574b7608 f1eac2b8a0
commit 341dc59053
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/movenc.c
View File

@ -3826,7 +3826,7 @@ static int mov_write_header(AVFormatContext *s)
if (!(mov->flags & (FF_MOV_FLAG_FRAG_KEYFRAME |
FF_MOV_FLAG_FRAG_CUSTOM)) &&
!mov->max_fragment_duration && !mov->max_fragment_size)
mov->max_fragment_duration = 5000000;
mov->flags |= FF_MOV_FLAG_FRAG_KEYFRAME;
}
if (mov->reserved_moov_size){

12
tests/ref/lavf/ismv
View File

@ -1,9 +1,9 @@
1efcfb3f09a9802ba63f6f592601281e *./tests/data/lavf/lavf.ismv
312255 ./tests/data/lavf/lavf.ismv
ec3e7d37755378cbe9907175768afbac *./tests/data/lavf/lavf.ismv
312453 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0x9d9a638a
95a3553714bb603f6b0e2bc0fc3fb319 *./tests/data/lavf/lavf.ismv
321181 ./tests/data/lavf/lavf.ismv
a4b6fb1f46848622477230f69040942c *./tests/data/lavf/lavf.ismv
321359 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0xe8130120
1efcfb3f09a9802ba63f6f592601281e *./tests/data/lavf/lavf.ismv
312255 ./tests/data/lavf/lavf.ismv
ec3e7d37755378cbe9907175768afbac *./tests/data/lavf/lavf.ismv
312453 ./tests/data/lavf/lavf.ismv
./tests/data/lavf/lavf.ismv CRC=0x9d9a638a