diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 14:08:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-09 14:08:01 +0100 |
| commit | 1374b5e15b5dd900bb5a69d78491b793db1c7f38 (patch) | |
| tree | 17020da146a8d0bb3ead129d9d8727911b839732 /doc | |
| parent | e7d924da30f0bd3cb680f45246526d312d2d2d6f (diff) | |
| parent | 1dd1c1c884b2038291fdabf3916b0a3f88ac6411 (diff) | |
| download | ffmpeg-1374b5e15b5dd900bb5a69d78491b793db1c7f38.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avio: K&R cosmetic formatting
Conflicts:
libavformat/aviobuf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions