• Michael Niedermayer's avatar
    Merge commit 'c68317eb' · 719fde47
    Michael Niedermayer authored
    * commit 'c68317eb':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    719fde47
avcodec.h 163 KB