Michael Niedermayer 719fde47ca
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 >
2012-10-24 14:18:17 +02:00
2012-10-20 12:37:52 +02:00
2012-10-19 13:58:14 +02:00
2012-10-19 13:58:14 +02:00
2012-10-19 13:58:14 +02:00
2012-10-23 15:00:27 +02:00
2012-10-24 12:53:26 +02:00
2012-10-23 15:00:27 +02:00
2012-10-19 13:29:24 +02:00
2012-10-21 13:35:42 +02:00
2012-10-22 14:50:06 +02:00
2012-10-18 22:51:44 +02:00
2012-10-24 14:18:17 +02:00
2012-10-23 12:36:16 +02:00
2012-10-24 14:18:17 +02:00
2012-10-20 15:33:44 +02:00
2012-10-19 14:15:47 +02:00
2012-10-19 00:08:01 +00:00
2012-10-19 13:29:24 +02:00
2012-10-21 13:35:42 +02:00
2012-10-21 13:35:42 +02:00
2012-10-21 18:05:22 +02:00
2012-10-19 13:29:24 +02:00
2012-10-24 14:18:17 +02:00
2012-10-19 13:29:24 +02:00
2012-10-20 01:56:50 +02:00
2012-10-24 14:01:36 +02:00
2012-10-23 16:53:42 +02:00
2012-10-20 00:07:14 +02:00
2012-10-23 15:00:27 +02:00
2012-10-24 14:18:17 +02:00
2012-10-21 16:13:55 +02:00
2012-10-21 17:01:01 +02:00
2012-10-21 16:13:55 +02:00
2012-10-21 16:13:55 +02:00
2012-10-23 15:00:27 +02:00
2012-10-23 15:00:27 +02:00
2012-10-23 03:03:53 +02:00
2012-10-23 03:03:59 +02:00
2012-10-21 18:22:50 +02:00
2012-10-21 18:22:50 +02:00
2012-10-19 00:08:01 +00:00
2012-10-19 14:15:47 +02:00
2012-10-19 18:05:12 +02:00
2012-10-23 00:03:49 +02:00
2012-10-19 00:08:01 +00:00
2012-10-19 00:08:02 +00:00
2012-10-24 14:18:17 +02:00
2012-10-20 18:00:13 +02:00
2012-10-23 12:36:16 +02:00
2012-10-23 13:34:42 +02:00
2012-10-23 13:34:42 +02:00
2012-10-19 13:29:24 +02:00
2012-10-19 00:05:03 +02:00
2012-10-19 01:20:27 +02:00
2012-10-19 13:29:24 +02:00
2012-10-19 13:29:24 +02:00
2012-10-19 13:29:24 +02:00
2012-10-19 13:29:24 +02:00
2012-10-19 13:29:24 +02:00
2012-10-19 13:29:24 +02:00
2012-10-24 14:01:36 +02:00
2012-10-24 00:40:18 +02:00
2012-10-19 13:29:24 +02:00
2012-10-20 12:37:52 +02:00
2012-10-23 12:36:16 +02:00
2012-10-23 12:36:16 +02:00
2012-10-23 17:25:38 +00:00
2012-10-23 15:00:27 +02:00
2012-10-20 01:56:50 +02:00
2012-10-19 02:57:57 +02:00
2012-10-19 03:15:06 +02:00
2012-10-21 17:09:36 +02:00
2012-10-18 22:51:44 +02:00
2012-10-21 17:29:10 +02:00
2012-10-19 03:36:42 +02:00
2012-10-19 00:08:02 +00:00
2012-10-24 14:18:17 +02:00
2012-10-19 18:57:57 +02:00
2012-10-20 00:07:43 +02:00
2012-10-20 00:07:43 +02:00
2012-10-21 17:29:10 +02:00
2012-10-21 18:05:22 +02:00
2012-10-23 15:00:27 +02:00
2012-10-23 10:28:40 +02:00
2012-10-19 00:08:01 +00:00
2012-10-19 00:08:01 +00:00
Michael Niedermayer
719fde47ca