Commit Graph

14 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
Michael Niedermayer
719a576f04 lavfi-showfiltfmts: fix typo that segfaulted haiku.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-15 19:46:55 +01:00
Michael Niedermayer
1b84e06244 lavfi-showfiltfmts.c: fix handling of null names
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-11-26 18:12:25 +01:00
Stefano Sabatini
9c484d2944 lavfi-showfiltfmts: extend output format for specifying audio data
This is required for extending lavfi tests to audio filtering.
2011-07-28 10:04:09 +02:00
Stefano Sabatini
4ae28eb853 showfiltfmts: use av_get_pix_fmt_name()
Use av_get_pix_fmt_name() rather than access
av_pix_fmt_descriptors. Improve readability.
2011-06-07 12:44:51 +02: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
Stefano Sabatini
24de0edbd5 Rename avfilter_destroy() as avfilter_free().
The new name is shorter and more consistent with the FFmpeg API, and
sounds less evil.

Originally committed as revision 25707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-08 12:32:39 +00:00
Stefano Sabatini
a8542e433e Set the correct type for the output links.
Originally committed as revision 24810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 18:07:57 +00:00
Stefano Sabatini
84c0386960 Change avfilter_open() signature, from:
AVFilterContext *avfilter_open(AVFilter *filter, const char *inst_name);
to:
int avfilter_open(AVFilterContext **filter_ctx, AVFilter *filter, const char *inst_name);

This way it is possible to propagate an error code telling the reason
of the failure.

Originally committed as revision 24765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-11 11:44:51 +00:00
Måns Rullgård
56e0d112d3 showfiltfmts: destroy filter context before exit
Originally committed as revision 24722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 22:25:44 +00:00
Måns Rullgård
c61f84bf97 showfiltfmts: set media type of links to that of corresponding pad
Originally committed as revision 24721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-06 22:25:42 +00:00
Måns Rullgård
27971664d3 lavfi-showfiltfmts: print one format per line
Originally committed as revision 24647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 11:34:56 +00:00
Stefano Sabatini
e34d5db595 Add libavfilter 1-input - 1-output regression test, corresponding to the
target regtest-lavfi_pix_fmts.

The lavfi_pix_fmts test is disabled, this because there are
many tests which are failing, and there are still some output files
which cannot be played by NUT/ffplay.

Originally committed as revision 23297 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-24 20:38:50 +00:00