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
..
build_libstagefright	Merge remote-tracking branch 'hexene/stagefright'	2011-10-13 18:04:02 +02:00
clean-diff
cws2fws.c	tests/tools/examples: Replace direct exit() calls by return.	2011-12-08 01:00:58 +01:00
enum_options.c	tools: add a tool for enumerating/printing AVOptions in texinfo format	2011-10-24 14:18:07 +02:00
graph2dot.c	graph2dot: show timebase information for audio links	2011-09-17 01:36:32 +02:00
lavfi-showfiltfmts.c	lavfi-showfiltfmts.c: fix handling of null names	2011-11-26 18:12:25 +01:00
patcheck	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
pktdumper.c	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
probetest.c
qt-faststart.c
trasher.c
unwrap-diff