[FFmpeg-cvslog] Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 24 14:18:17 2012 +0200| [719fde47ca641edd4321f384579438f930bc50eb] | committer: Michael Niedermayer

Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'

* commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881':
  lavc: fix documentation for AVCodecContext.delay
  atrac3: return an error if extradata_size is not a specific known size
  lavc: use the correct API version guard macro for avcodec_encode_audio()
  Move Doxyfile into the doc/ subdirectory
  doxygen: Build Doxygen documentation in the doc/ subdirectory
  dfa: use av_memcpy_backptr() where previously impossible
  av_memcpy_backptr: Drop no longer necessary malloc padding

Conflicts:
	.gitignore
	libavcodec/avcodec.h

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

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