diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:29:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-04 13:29:15 +0100 |
| commit | a08194b4c51ebc7024f50eed0f09aa74058e15bb (patch) | |
| tree | 1716b42c83f77e09dd934d3d4fd58e784e8e547a /library.mak | |
| parent | 8d0b2aae71f01904e4a7ac0e8795592da5a0bd89 (diff) | |
| parent | be6cde3ce86e9ecf9b52309d7ca68c410ced525d (diff) | |
| download | ffmpeg-a08194b4c51ebc7024f50eed0f09aa74058e15bb.tar.gz | |
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>
Diffstat (limited to 'library.mak')
0 files changed, 0 insertions, 0 deletions