Merge commit 'c68317ebbe4915035df0b08c23eea7a0b80ab881'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Oct 2012 12:18:17 +0000 (14:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Oct 2012 12:18:17 +0000 (14:18 +0200)
commit719fde47ca641edd4321f384579438f930bc50eb
tree577820b177126467a82a115aebf759cd04611d78
parent5cf794e0c1f7b651de4b1a61a6786fb71e9679b3
parentc68317ebbe4915035df0b08c23eea7a0b80ab881
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@gmx.at>
.gitignore
doc/Doxyfile
libavcodec/atrac3.c
libavcodec/avcodec.h
libavcodec/dfa.c
libavcodec/eatgv.c
libavcodec/lcldec.c
libavcodec/utils.c