Commit Graph

8 Commits

Author SHA1 Message Date
Michael Niedermayer
3c5fe5b527 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  wma: Clip WMA1 and WMA2 frame length to 11 bits.
  movenc: Don't require frame_size to be set for modes other than mov
  doc: Update APIchanges with info on muxer flushing
  movenc: Reindent a block
  tools: Remove some unnecessary #undefs.
  rv20: prevent calling ff_h263_decode_mba() with unset height/width
  tools: K&R reformatting cosmetics
  Ignore generated aviocat and ismindex tools.
  build: Automatically include architecture-specific library Makefile snippets.
  indeo5: prevent null pointer dereference on broken files
  pktdumper: Use usleep instead of sleep
  cosmetics: Remove some unnecessary block braces.
  Drop unnecessary prefix from *sink* variable and struct names.
  Add a tool for creating smooth streaming manifests
  movdec: Calculate an average bit rate for fragmented streams, too
  movenc: Write the sample rate instead of time scale in the stsd atom
  movenc: Add a separate ismv/isma (smooth streaming) muxer
  movenc: Allow the caller to decide on fragmentation
  libavformat: Add a flag for muxers that support write_packet(NULL) for flushing
  movenc: Add support for writing fragmented mov files
  ...

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	ffmpeg.c
	ffplay.c
	libavfilter/Makefile
	libavformat/Makefile
	libavformat/avformat.h
	libavformat/movenc.c
	libavformat/movenc.h
	libavformat/version.h
	tools/graph2dot.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-26 02:23:56 +01:00
Diego Biurrun
4e81b5f517 tools: K&R reformatting cosmetics 2012-01-25 15:31:11 +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
Aurelien Jacobs
ad2d0fdf25 probetest: replace usage of deprecated first_iformat by av_iformat_next()
Originally committed as revision 25490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-15 14:44:18 +00:00
Diego Biurrun
9407246d7a Drop argc/argv parameters from main(), they are unused.
Originally committed as revision 19907 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 10:14:46 +00:00
Diego Biurrun
497559ec90 cosmetics: K&R coding style, prettyprinting
Originally committed as revision 19906 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 10:13:10 +00:00
Martin Storsjö
ff19d438dc Init i to 0 (10l fix).
Patch by Martin Storsjö / martin von martin aus st

Originally committed as revision 19855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 13:09:34 +00:00
Michael Niedermayer
6e7ef5ec35 Probetest, to test the demuxers probe functions against random and not so random
input.

Originally committed as revision 19853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 10:42:01 +00:00