1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

12 Commits

Author SHA1 Message Date
Michael Niedermayer
c130428ab5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avprobe, cmdutils: K&R formatting cosmetics
  tests: K&R formatting cosmetics for test programs
  lavf: free packets for muxers implementing interleave_packet().
  lavf: fix and extend av_interleaved_write_frame() doxy.
  mov: Remove dead stores for spherical coordinates for channel position.
  error_resilience: K&R formatting cosmetics
  RELEASE_NOTES: mention hiding private symbols in shared builds.
  RELEASE_NOTES: mention some notable API changes in 0.8

Conflicts:
	cmdutils.h
	doc/RELEASE_NOTES
	ffprobe.c
	libavcodec/error_resilience.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-19 01:19:38 +01:00
Gaurav Narula
b481bbc32a tests: K&R formatting cosmetics for test programs 2012-01-18 21:07:17 +01:00
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
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Justin Ruggles
6c834328b9 Allow audiogen to take commandline parameters for sample rate and number of
channels.

Originally committed as revision 25127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 21:36:04 +00:00
Diego Biurrun
6f2162b471 Mark functions only used within the test programs as static.
Originally committed as revision 17454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-19 10:09:46 +00:00
Diego Biurrun
c9639fab61 typo
Originally committed as revision 9121 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-24 23:13:10 +00:00
Diego Biurrun
eebfba2e24 Add standard LGPL header with Fabrice's permission.
Originally committed as revision 8150 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-27 16:56:57 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Mike Melanson
baf23f0c10 use the correct file modes
Originally committed as revision 2381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-15 01:22:50 +00:00
Fabrice Bellard
51133a7db0 added first version of regression tests - simply type 'make test' to test every codec and some mux/demuxes - added simple synthetic audio and video bitstreams generators so that no big streams needs to be used
Originally committed as revision 532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-05-18 23:18:22 +00:00