Merge commit '39523030108815242178ac5e209c83070bd1baef'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 10:16:31 +0000 (12:16 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 20 Aug 2013 10:16:31 +0000 (12:16 +0200)
* commit '39523030108815242178ac5e209c83070bd1baef':
  mov: Set the timescale for data streams

Conflicts:
libavformat/movenc.c

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

@@@ -3696,8 -3126,8 +3696,10 @@@ static int mov_write_header(AVFormatCon
              }
          } else if (st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE) {
              track->timescale = st->codec->time_base.den;
-         }else{
+         } else if (st->codec->codec_type == AVMEDIA_TYPE_DATA) {
+             track->timescale = st->codec->time_base.den;
++        } else {
 +            track->timescale = MOV_TIMESCALE;
          }
          if (!track->height)
              track->height = st->codec->height;