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-06 01:37:27 +01:00
2011-12-12 21:54:52 +01:00
2011-12-13 00:39:48 +01:00
2011-03-19 13:33:20 +00:00
2011-12-11 01:05:33 +01:00
2011-07-07 22:47:24 +02:00
2011-12-11 01:05:33 +01:00
2011-11-24 00:33:20 +01:00
2011-10-10 03:50:58 +02:00
2011-03-19 13:35:52 +00:00
2011-11-24 03:32:24 +01:00
2011-09-22 17:39:30 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-08-01 11:36:16 +02:00
2011-12-12 20:51:29 +01:00
2011-08-13 02:56:08 +02:00
2003-04-11 13:43:17 +00:00
2011-12-12 01:44:11 +01:00
2011-01-18 20:48:24 +00:00
2011-12-10 19:34:28 +01:00
2011-12-13 00:39:48 +01:00
2011-04-29 18:08:46 +02:00
2011-12-13 00:39:48 +01:00