aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/version.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-04 10:17:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-04 10:17:52 +0200
commit0104570fb65bef9986a630e0188b3756295693a9 (patch)
treed0612ebe9b9cdf7fcf7da0c6ced55c0609887e05 /libavdevice/version.h
parent711c8ee71d719d6d89a523618f078bb17dbe1abf (diff)
parenta5f8873620ce502d37d0cc3ef93ada2ea8fb8de7 (diff)
downloadffmpeg-0104570fb65bef9986a630e0188b3756295693a9.tar.gz
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7': silly typo fixes Conflicts: doc/protocols.texi libavcodec/aacpsy.c libavformat/utils.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/version.h')
0 files changed, 0 insertions, 0 deletions