Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Aug 2011 13:27:02 +0000 (15:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Aug 2011 13:27:02 +0000 (15:27 +0200)
commitff96098084542c3ef98b360f70583999433d13a7
tree620b6e7702ddbc0fb1ccc3525299feb0781abfca
parent34c997599e14b4ef5f84aa324fdea7ae03d7a2ba
parentccb919e34b1276db5cfcd903e405e47ccb932d58
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  WavPack demuxer: do not rely on index when timestamp is not in indexed range.
  WavPack demuxer: store position of the first block in index.
  WavPack decoder: implement flush function
  avconv: Separate initialization from the main transcode loop.

Conflicts:
avconv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avconv.c
libavcodec/wavpack.c
libavformat/wv.c