Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:25:44 +0000 (11:25 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 18 May 2013 09:25:58 +0000 (11:25 +0200)
commit20f75a810c49743683b7e503cbbc1db0a04a8925
tree6e9c7784ca7fea9bc853cd68ba3a3d92e5dd5c93
parent97200d89b9fccef1b72ea0e0e1d8eff7a5e05f43
parent006ec64877fb638de4b15ae5fd969e22bd0f60ca
Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

* commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca':
  lavr doxy: add version.h to the lavr group
  lavc doxy: add avcodec.h to the libavcodec group.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h