Merge commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 11:07:26 +0000 (13:07 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 11:07:26 +0000 (13:07 +0200)
* commit 'df2aa22203afc9377832bdf800df5dbd3aa9687e':
  mov: Clarify tkhd flag settings

Conflicts:
libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/movenc.c

@@@ -1777,9 -1465,10 +1777,11 @@@ static int mov_write_tkhd_tag(AVIOConte
      int64_t duration = av_rescale_rnd(track->track_duration, MOV_TIMESCALE,
                                        track->timescale, AV_ROUND_UP);
      int version = duration < INT32_MAX ? 0 : 1;
+     int flags   = MOV_TKHD_FLAG_IN_MOVIE;
 +    int rotation = 0;
      int group   = 0;
  
      if (st) {
          if (mov->per_stream_grouping)
              group = st->index;