diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 12:33:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 13:09:53 +0200 |
| commit | 341dc590535121ccb939ca145d87241de9e8e0c3 (patch) | |
| tree | 80bb9316ad15f2a20c9735d291220bd790fef9ee /libavformat | |
| parent | d4574b7608348a333cac5486b05bbc2d33a545ce (diff) | |
| parent | f1eac2b8a0370b908cd691086d11f51342054730 (diff) | |
Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730'
* commit 'f1eac2b8a0370b908cd691086d11f51342054730':
movenc: Use keyframes as default fragmentation point in ismv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 44f8e6b771..d21906b406 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -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){ |