Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jan 2013 12:29:09 +0000 (13:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Jan 2013 12:29:15 +0000 (13:29 +0100)
commita08194b4c51ebc7024f50eed0f09aa74058e15bb
tree1716b42c83f77e09dd934d3d4fd58e784e8e547a
parent8d0b2aae71f01904e4a7ac0e8795592da5a0bd89
parentbe6cde3ce86e9ecf9b52309d7ca68c410ced525d
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix missing " in header documentation
  aviobuf: Discard old buffered, previously read data in ffio_read_partial

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