diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 22:29:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-24 22:29:24 +0100 |
| commit | 75f6ed8dc2321d34a0c0b3b9ec7705e7ce7dc0ea (patch) | |
| tree | 4dfdd73966af1069a543e352c0d4467064fef903 /ffmpeg_opt.c | |
| parent | 26dad980baaa6858561b3269d375c1d9223f579c (diff) | |
| parent | c91488ab33679add25eeb8c0229dc0b8f6acb5a4 (diff) | |
| download | ffmpeg-75f6ed8dc2321d34a0c0b3b9ec7705e7ce7dc0ea.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc: fix one accented word
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_opt.c')
0 files changed, 0 insertions, 0 deletions