1
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-09-02 14:33:23 +02:00
ffmpeg/libpostproc
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
..
libpostproc.v Add symbol versioning for shared libraries 2010-01-16 04:49:02 +00:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-06-29 05:23:12 +02:00
postprocess_altivec_template.c Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
postprocess_internal.h Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
postprocess_template.c Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00
postprocess.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
postprocess.h Merge remote-tracking branch 'qatar/master' 2011-12-13 00:39:48 +01:00