aboutsummaryrefslogtreecommitdiffstats
path: root/doc/Doxyfile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-10 02:09:13 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-10 02:09:13 +0200
commita71fcfad892c4c59a011556f70b998aca1139b37 (patch)
treeaf961a49102589bc3e8ca8ea93d969428f1e05de /doc/Doxyfile
parent329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8 (diff)
parent9325d88eba8038b3e2a4485e473a018410379e2d (diff)
downloadffmpeg-a71fcfad892c4c59a011556f70b998aca1139b37.tar.gz
Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'
* commit '9325d88eba8038b3e2a4485e473a018410379e2d': lavc: remove obsolete and disabled avpriv functions Conflicts: libavcodec/dv_profile.c libavcodec/dv_profile.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/Doxyfile')
0 files changed, 0 insertions, 0 deletions