Commit Graph

12 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
Diego Biurrun f19a068ef6 Add missing stdlib.h #include, fixes the warnings:
tools/trasher.c:44: warning: implicit declaration of function ‘atoi’
tools/trasher.c:53: warning: implicit declaration of function ‘abs’

Originally committed as revision 22328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 17:00:21 +00:00
Michael Niedermayer 5988dc9eec Remove apparently unneeded define and includes.
Originally committed as revision 22229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 01:32:52 +00:00
Michael Niedermayer 47cf98efcb Make trasher use a well defined random number generator and allow the seed to be specified on the cmd line.
Originally committed as revision 22228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 01:31:17 +00:00
Diego Biurrun 6510c453ab Add _XOPEN_SOURCE #define. This is necessary for (s)random(), which are XSI
extensions of POSIX. Avoids implicit declaration warnings on some systems.

Originally committed as revision 18178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-24 16:28:48 +00:00
Matthieu Castet 4a8361f848 tools/trasher: Don't mix srand/rand and srandom/random interface.
patch by matthieu castet, castet.matthieu free fr

Originally committed as revision 14222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 21:44:00 +00:00
Diego Biurrun c33820e52e Add LGPL license header.
Originally committed as revision 11490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-10 10:26:57 +00:00
Mike Melanson 90527811d7 Error checking: make sure that there are 3 parameters and that the
file open operation succeeds.

Originally committed as revision 11479 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-09 00:29:49 +00:00
Diego Biurrun e36f0f03cc Remove unused variable i.
Originally committed as revision 11474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 22:57:03 +00:00
Michael Niedermayer 0f340f8fc5 A little proggy i wrote years ago.
This simply writes burts of random data into a file. Great for testing error
robustness/resilience/concealment.

Originally committed as revision 11459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-08 00:54:19 +00:00