RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 16:52:31 +00:00
Code Issues Projects Releases Wiki Activity
6faf0a21e1
ffmpeg/doc
History
Michael Niedermayer 6faf0a21e1 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (53 commits)
  probe: Restore identification of files with very large id3 tags and no extension.
  probe: Remove id3 tag presence as a criteria to do file extension checking.
  mpegts: MP4 SL support
  mpegts: MP4 OD support
  mpegts: Add support for Sections in PMT
  mpegts: Replace the MP4 descriptor parser with a recursive parser.
  mpegts: Add support for multiple mp4 descriptors
  mpegts: Parse mpeg2 SL descriptors.
  isom: Add MPEG4SYSTEMS dummy object type indication.
  aacdec: allow output reconfiguration on channel changes
  nellymoserenc: take float input samples instead of int16
  nellymoserdec: use dsp functions for overlap and windowing
  nellymoserdec: do not fail if there is extra data in the packet
  nellymoserdec: fail if output buffer is too small
  nellymoserdec: remove pointless buffer size check.
  lavf: add init_put_byte() to the list of visible symbols.
  seek-test: free options dictionary after use
  snow: do not draw_edge if emu_edge is set
  tools/pktdumper: update to recent avformat api
  seek-test: update to recent avformat api
  ...

Conflicts:
	doc/APIchanges
	libavcodec/mpegaudiodec.c
	libavcodec/nellymoserdec.c
	libavcodec/snow.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavformat/avformat.h
	libavformat/mpegts.c
	libavformat/mxfdec.c
	libavformat/utils.c
	libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-29 02:08:54 +02:00
..
examples Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
APIchanges Merge remote-tracking branch 'qatar/master' 2011-10-29 02:08:54 +02:00
avconv.texi Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
avtools-common-opts.texi Merge remote-tracking branch 'qatar/master' 2011-10-19 02:08:59 +02:00
avutil.txt
bitstream_filters.texi
build_system.txt
decoders.texi
demuxers.texi
developer.texi Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
encoders.texi Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
eval.texi eval: add mathematical constants (PI, E, PHI). 2011-10-13 16:50:20 +02:00
faq.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
fate.txt
ffmpeg-mt-authorship.txt
ffmpeg.texi Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ffmpeg.txt doc: small ascii diagram on I/O files and streams in ffmpeg.c 2011-10-12 15:43:52 +02:00
ffplay.texi ffplay.texi: document -codec 2011-09-27 22:00:20 +02:00
ffprobe.texi ffprobe: parse arguments for -print_format writer 2011-10-09 16:03:13 +02:00
ffserver.conf
ffserver.texi Merge remote-tracking branch 'qatar/master' 2011-09-12 00:32:54 +02:00
filters.texi vf_showinfo: print checksums in hexadecimal. 2011-10-27 22:14:57 +02:00
general.texi Merge remote-tracking branch 'qatar/master' 2011-10-27 01:39:04 +02:00
git-howto.txt
indevs.texi Merge remote-tracking branch 'qatar/master' 2011-10-28 03:05:16 +02:00
issue_tracker.txt doc: issue tracking: explain the term issue 2011-09-02 23:08:03 +02:00
libavfilter.texi Remove reference to the libavfilter soc SVN repo, update libavfilter status description 2011-09-10 23:40:52 +02:00
Makefile
metadata.texi
multithreading.txt
muxers.texi doc: tiny spelling fix 2011-10-27 00:25:32 +02:00
optimization.txt
outdevs.texi
protocols.texi Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
rate_distortion.txt
RELEASE_NOTES
snow.txt
soc.txt
swresample.txt swr-docs: update due to last change to swresample 2011-10-06 00:32:01 +02:00
swscale.txt
t2h.init
tablegen.txt
texi2pod.pl
viterbi.txt