[FFmpeg-cvslog] Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 18 11:25:44 2013 +0200| [20f75a810c49743683b7e503cbbc1db0a04a8925] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=20f75a810c49743683b7e503cbbc1db0a04a8925
---