Merge commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Aug 2012 19:49:00 +0000 (21:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Aug 2012 19:49:00 +0000 (21:49 +0200)
* commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4':
  build: fix library installation on cygwin
  mpc8: add a flush function
  mpc8: set packet duration and stream start time instead of tracking frames

Conflicts:
libavformat/mpc8.c

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

diff --cc configure
Simple merge
Simple merge
@@@ -240,10 -239,9 +239,11 @@@ static int mpc8_read_header(AVFormatCon
      st->codec->channels = (st->codec->extradata[1] >> 4) + 1;
      st->codec->sample_rate = mpc8_rate[st->codec->extradata[0] >> 5];
      avpriv_set_pts_info(st, 32, 1152  << (st->codec->extradata[1]&3)*2, st->codec->sample_rate);
+     st->start_time = 0;
      st->duration = c->samples / (1152 << (st->codec->extradata[1]&3)*2);
      size -= avio_tell(pb) - pos;
 +    if (size > 0)
 +        avio_skip(pb, size);
  
      if (pb->seekable) {
          int64_t pos = avio_tell(s->pb);