diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 02:35:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-07 02:35:39 +0200 |
| commit | 71f33051e5d012ccf24d447ba7c01a867f8e77c1 (patch) | |
| tree | 25b96b42c0a4aa63d2530750673ea471e683f227 /libavformat | |
| parent | 4213fc5b9eebec53c7d22b770c3f1ceecca1c113 (diff) | |
| parent | d9432789bd119f0e37bcf65cebda05d36aafd4ed (diff) | |
| download | ffmpeg-71f33051e5d012ccf24d447ba7c01a867f8e77c1.tar.gz | |
Merge commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed'
* commit 'd9432789bd119f0e37bcf65cebda05d36aafd4ed':
movenc: remove pointless loop around BITEXACT test
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 27e9f1a150..9e34e0a09a 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3909,9 +3909,8 @@ static int mov_write_header(AVFormatContext *s) else if (!strcmp("f4v", s->oformat->name)) mov->mode = MODE_F4V; } - for (i = 0; i < s->nb_streams; i++) - if (s->flags & AVFMT_FLAG_BITEXACT) - mov->exact = 1; + if (s->flags & AVFMT_FLAG_BITEXACT) + mov->exact = 1; /* Set the FRAGMENT flag if any of the fragmentation methods are * enabled. */ |