FFmpeg/libavcodec
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-08 02:09:28 +02:00
2012-10-09 04:00:55 +02:00
2012-09-21 01:03:31 +02:00
2012-10-20 15:33:44 +02:00
2012-10-19 00:08:01 +00:00
2012-10-21 18:05:22 +02:00
2012-10-13 00:31:21 +02:00
2012-10-14 05:48:02 +02:00
2012-10-18 20:29:03 +02:00
2012-10-12 17:58:15 +02:00
2012-09-30 14:05:04 +00:00
2012-10-23 03:03:59 +02:00
2012-10-09 16:48:43 +02:00
2012-10-21 18:22:50 +02:00
2012-10-21 18:22:50 +02:00
2012-10-14 22:16:31 +02:00
2012-10-15 03:18:08 +02:00
2012-10-13 03:54:04 +02:00
2012-10-13 03:54:04 +02:00
2012-10-19 00:08:01 +00:00
2012-10-19 00:08:02 +00:00
2012-10-18 21:42:04 +02:00
2012-10-12 01:44:35 +02:00
2012-10-14 21:45:42 +02:00
2012-10-03 16:14:59 +02:00
2012-10-13 08:22:26 +00:00
2012-10-13 16:02:09 +00:00
2012-10-01 13:42:44 -04:00
2012-10-15 15:09:46 +02:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 09:06:25 +00:00
2012-10-08 22:49:23 -05:00
2012-10-21 17:29:10 +02:00
2012-10-19 03:36:42 +02:00
2012-10-12 18:17:10 +03:00
2012-10-10 16:48:13 +00:00
2012-10-21 17:29:10 +02:00
2012-09-23 15:24:08 +02:00
2012-10-13 18:00:48 +00:00
2012-10-15 13:28:23 +00:00