Michael Niedermayer
8bc7fe4daf
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doxygen: misc consistency, spelling and wording fixes
vcr1: drop unnecessary emms_c() calls without MMX code
Replace all uses of av_close_input_file() with avformat_close_input().
lavf: add avformat_close_input().
lavf: deprecate av_close_input_stream().
lavf doxy: add some basic demuxing documentation.
lavf doxy: add some general lavf information.
lavf doxy: add misc utility functions to a group.
lavf doxy: add av_guess_codec/format to the encoding group.
lavf doxy: add core functions to a doxy group.
Add basic libavdevice documentation.
lavc: convert error_recognition to err_recognition.
avconv: update -map option help text
x86: Require 7 registers for the cabac asm
x86: bswap: remove test for bswap instruction
bswap: make generic implementation more compiler-friendly
h264: remove useless cast
proresdec: fix decode_slice() prototype
Conflicts:
configure
doc/APIchanges
ffprobe.c
libavcodec/avcodec.h
libavcodec/celp_math.h
libavcodec/h264.c
libavfilter/src_movie.c
libavformat/anm.c
libavformat/avformat.h
libavformat/version.h
libavutil/avstring.h
libavutil/bswap.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 00:39:48 +01:00
..
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-05-13 04:40:40 +02:00
2011-03-19 13:33:20 +00:00
2011-03-19 13:33:20 +00:00
2011-12-13 00:39:48 +01:00
2011-12-09 00:05:51 +01:00
2011-11-23 04:02:17 +01:00
2011-12-05 20:05:44 +01:00
2011-11-23 04:02:17 +01:00
2011-11-11 04:24:00 +01:00
2011-11-26 01:12:08 +01:00
2011-12-10 02:01:03 +01:00
2011-05-22 04:53:19 +02:00
2011-11-07 03:01:43 +01:00
2011-12-13 00:39:48 +01:00
2011-12-13 00:39:48 +01:00
2011-12-05 20:05:44 +01:00
2011-11-23 04:02:17 +01:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2011-11-26 01:12:08 +01:00
2011-09-27 02:14:37 +02:00
2011-09-27 02:14:37 +02:00
2011-03-19 13:33:20 +00:00
2011-12-05 00:11:57 +01:00
2011-03-19 13:33:20 +00:00
2011-12-05 20:05:44 +01:00
2011-09-21 21:25:43 +02:00
2011-11-07 03:01:43 +01:00
2011-11-23 04:02:17 +01:00
2011-12-03 15:18:58 +01:00
2011-12-03 15:18:58 +01:00
2011-12-05 20:05:44 +01:00
2011-12-12 01:25:37 +01:00
2011-08-26 23:18:54 +02:00
2011-08-30 10:03:13 +02:00
2011-10-16 22:32:41 +02:00
2011-10-16 21:51:28 +02:00
2011-11-20 02:46:06 +01:00
2011-11-23 04:02:17 +01:00
2011-06-28 13:14:46 +02:00
2011-06-28 13:14:46 +02:00
2011-12-13 00:39:48 +01:00
2011-10-12 05:40:57 +02:00
2011-12-12 01:25:37 +01:00
2011-12-11 18:47:19 +00:00
2011-11-23 04:02:17 +01:00
2011-06-18 05:10:38 +02:00
2011-06-08 05:25:28 +02:00
2011-12-05 00:11:57 +01:00
2011-07-04 00:45:21 +02:00
2011-10-22 19:49:27 +02:00
2011-07-12 01:42:32 +02:00
2011-03-19 13:33:20 +00:00
2011-12-08 18:47:47 +01:00
2011-12-08 18:47:47 +01:00
2011-12-06 01:37:27 +01:00
2011-12-08 00:23:37 +01:00
2011-08-26 23:18:54 +02:00
2011-06-29 05:23:12 +02:00
2011-11-23 04:02:17 +01:00
2011-07-04 00:45:21 +02:00
2011-11-23 04:02:17 +01:00
2011-12-11 03:00:30 +01:00
2011-11-23 04:02:17 +01:00
2011-12-05 03:22:04 +01:00
2011-12-05 21:13:45 +01:00
2011-11-17 02:44:33 +01:00
2011-12-13 00:39:48 +01:00
2011-06-29 23:49:03 +01:00
2011-06-29 23:49:03 +01:00
2011-12-05 00:11:57 +01:00
2011-11-25 04:34:44 +01:00
2011-11-28 02:44:05 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-03-19 13:33:20 +00:00
2011-06-24 03:07:04 +02:00
2011-12-03 00:35:20 +01:00
2011-11-24 16:55:45 +01:00
2011-07-05 02:26:17 +02:00
2011-11-23 04:02:17 +01:00
2011-05-11 13:43:30 +02:00
2011-05-11 13:43:30 +02:00
2011-11-29 00:20:29 +01:00
2011-12-05 00:11:57 +01:00
2011-11-23 04:02:17 +01:00
2011-08-20 14:20:25 +02:00
2011-03-19 13:33:20 +00:00