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)
commitbc773d0d422f6eb541b44d4c021831e804e103f7
tree8969818358a69c400af6c594a9858f18d6a690e5
parent0049af262825254705bdbb97c28004dd7c7c2b24
parentf5d2c597e99af218b0d4d1cf9737c7e68ee934e4
Merge commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'

* 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>
configure
libavcodec/mpc8.c
libavformat/mpc8.c