aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-18 11:17:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-18 11:17:52 +0200
commit97200d89b9fccef1b72ea0e0e1d8eff7a5e05f43 (patch)
treef393666a8f51e7533c38e91169527f837f5e8e2c /libavdevice
parent0718f0cc24bc8413cd0cf44fcf000f0e52a67522 (diff)
parent40020e171a3549a2c0b65ce6f2649aec868872f2 (diff)
downloadffmpeg-97200d89b9fccef1b72ea0e0e1d8eff7a5e05f43.tar.gz
Merge commit '40020e171a3549a2c0b65ce6f2649aec868872f2'
* commit '40020e171a3549a2c0b65ce6f2649aec868872f2': doxy: add a section about versioning. Conflicts: libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice')
0 files changed, 0 insertions, 0 deletions