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)
* 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>
1  2 
libavformat/aviobuf.c

Simple merge