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-11-03 19:25:26 +01:00
2011-11-24 03:32:24 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-18 19:39:26 +01:00
2011-11-06 00:05:14 +01:00
2011-12-11 11:55:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-24 03:32:24 +01:00
2011-12-04 21:13:22 +01:00
2011-11-26 01:12:08 +01:00
2011-11-26 01:12:08 +01:00
2011-12-12 23:06:23 +01:00
2011-09-28 08:02:53 +02:00
2011-11-22 15:09:26 +01:00
2011-12-08 21:19:23 +01:00
2011-11-30 18:53:47 +01:00
2011-10-28 02:06:50 +02:00
2011-10-28 02:06:50 +02:00
2011-11-23 14:14:01 +01:00
2011-09-28 08:02:53 +02:00
2011-10-17 18:05:38 +02:00
2011-12-11 19:14:09 +01:00
2011-12-08 21:19:23 +01:00
2011-12-13 00:39:48 +01:00
2011-10-04 08:04:17 +02:00
2011-10-20 15:59:20 +02:00
2011-11-06 00:05:14 +01:00
2011-11-26 10:42:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-25 04:45:41 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-12 17:49:34 +01:00
2011-11-10 01:31:28 +01:00
2011-11-06 00:05:14 +01:00
2011-11-21 19:35:33 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-23 13:22:46 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-14 05:42:10 +01:00
2011-11-06 00:05:14 +01:00
2011-12-06 15:03:51 +01:00
2011-11-16 07:48:23 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-11-11 17:06:47 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00
2011-12-11 11:55:33 +01:00
2011-11-06 00:05:14 +01:00
2011-12-11 14:14:01 +01:00
2011-11-24 00:08:05 +01:00
2011-11-06 00:05:14 +01:00
2011-11-06 00:05:14 +01:00