[FFmpeg-cvslog] Merge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Jan 17 14:45:11 2014 +0100| [68ebf70f665bee7a55e99013eec51963429b8f4e] | committer: Michael Niedermayer

Merge commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1'

* commit 'ff23c4e4935e96e62d8ff2212a1955a43add88e1':
  doxy: Add AVFrame to the structured modules

Conflicts:
	libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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