diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 16:18:17 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 16:18:17 +0400 |
| commit | 719fde47ca641edd4321f384579438f930bc50eb (patch) | |
| tree | 577820b177126467a82a115aebf759cd04611d78 /libavcodec/avcodec.h | |
| parent | 5cf794e0c1f7b651de4b1a61a6786fb71e9679b3 (diff) | |
| parent | c68317ebbe4915035df0b08c23eea7a0b80ab881 (diff) | |
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>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8ee08148b5..0374de47f2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1607,6 +1607,8 @@ typedef struct AVCodecContext { int ticks_per_frame; /** + * Codec delay. + * * Encoding: Number of frames delay there will be from the encoder input to * the decoder output. (we assume the decoder matches the spec) * Decoding: Number of frames delay in addition to what a standard decoder |