Merge commit '42f9132218ca11a8e9a3c82a175b46bca092113e'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 20:37:42 +0000 (21:37 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 14 Jan 2014 20:37:42 +0000 (21:37 +0100)
* commit '42f9132218ca11a8e9a3c82a175b46bca092113e':
  mxf: Do not use int to check the seek position

Conflicts:
libavformat/mxfdec.c

See: 007989c7a2215f54aeaf2393ab3aff0c208e862f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/mxfdec.c

@@@ -2496,14 -2228,8 +2496,13 @@@ static int mxf_read_seek(AVFormatContex
      int64_t seconds;
      MXFContext* mxf = s->priv_data;
      int64_t seekpos;
 -    int ret;
 +    int i, ret;
-     int64_t ret64;
      MXFIndexTable *t;
 +    MXFTrack *source_track = st->priv_data;
 +
 +    /* if audio then truncate sample_time to EditRate */
 +    if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
 +        sample_time = av_rescale_q(sample_time, st->time_base, av_inv_q(source_track->edit_rate));
  
      if (mxf->nb_index_tables <= 0) {
      if (!s->bit_rate)