diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 00:09:56 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 00:09:56 +0100 |
| commit | 4da8dc64be50cd814b4dab75693207dc73bca47a (patch) | |
| tree | 79184f2aee4f090b3e5108a4ff6542e165aa8e52 /libavformat/avr.c | |
| parent | cbe92a93026a235dc17f698d58660be4910f0373 (diff) | |
| parent | 7caf48e036583cd5833f5dc07ab14960dff25e04 (diff) | |
| download | ffmpeg-4da8dc64be50cd814b4dab75693207dc73bca47a.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: miscellaneous cosmetics
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avr.c')
0 files changed, 0 insertions, 0 deletions