diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:18:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-24 14:18:17 +0200 |
| commit | 719fde47ca641edd4321f384579438f930bc50eb (patch) | |
| tree | 577820b177126467a82a115aebf759cd04611d78 /.gitignore | |
| parent | 5cf794e0c1f7b651de4b1a61a6786fb71e9679b3 (diff) | |
| parent | c68317ebbe4915035df0b08c23eea7a0b80ab881 (diff) | |
| download | ffmpeg-719fde47ca641edd4321f384579438f930bc50eb.tar.gz | |
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 '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 0b00f07e50..a2d19358a9 100644 --- a/.gitignore +++ b/.gitignore @@ -38,8 +38,8 @@ /doc/examples/muxing /doc/examples/scaling_video /doc/fate.txt +/doc/doxy/html/ /doc/print_options -/doxy/ /libavcodec/*_tablegen /libavcodec/*_tables.c /libavcodec/*_tables.h |