diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 01:05:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-09 01:05:37 +0100 |
| commit | 2beb81522e5994a377170a56f8f38b6a550e3f3b (patch) | |
| tree | a775cd0130d6ce936f7fa4f4016496accdc5f998 /libavformat/qcp.c | |
| parent | 0c1353ae338bac9a0c4052805f56f02952172223 (diff) | |
| parent | 8c09532672d7d3196ec52afefa2c96633bc17b62 (diff) | |
| download | ffmpeg-2beb81522e5994a377170a56f8f38b6a550e3f3b.tar.gz | |
Merge commit '8c09532672d7d3196ec52afefa2c96633bc17b62'
* commit '8c09532672d7d3196ec52afefa2c96633bc17b62':
rv10: K&R formatting cosmetics
Conflicts:
libavcodec/rv10.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/qcp.c')
0 files changed, 0 insertions, 0 deletions