diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 19:50:55 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-18 19:51:40 +0200 |
commit | f47751a56cc470c90f9761afd510e5a6560340f9 (patch) | |
tree | 3e37302a55eaa27e5ecd51509c5b66efb1e6f8a7 /libavdevice/avdevice.h | |
parent | 79593096c43c13a4524822fceffca7e4647ff67d (diff) | |
parent | dd35d451fbc34795a8d19ac6c281bed53c42a29b (diff) | |
download | ffmpeg-f47751a56cc470c90f9761afd510e5a6560340f9.tar.gz |
Merge commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b'
* commit 'dd35d451fbc34795a8d19ac6c281bed53c42a29b':
doc: Change wrong term to avoid confusion
Conflicts:
doc/developer.texi
No change, as the wrong term is not part of our docs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/avdevice.h')
0 files changed, 0 insertions, 0 deletions