FFmpeg git repo
Go to file
Michael Niedermayer cabbd271a5 Merge remote-tracking branch 'qatar/master'
* qatar/master: (24 commits)
  flvdec: remove incomplete, disabled seeking code
  mem: add support for _aligned_malloc() as found on Windows
  lavc: Extend the documentation for avcodec_init_packet
  flvdec: remove incomplete, disabled seeking code
  http: replace atoll() with strtoll()
  mpegts: remove unused/incomplete/broken seeking code
  af_amix: allow float planar sample format as input
  af_amix: use AVFloatDSPContext.vector_fmac_scalar()
  float_dsp: add x86-optimized functions for vector_fmac_scalar()
  float_dsp: Move vector_fmac_scalar() from libavcodec to libavutil
  lavr: Add x86-optimized function for flt to s32 conversion
  lavr: Add x86-optimized function for flt to s16 conversion
  lavr: Add x86-optimized functions for s32 to flt conversion
  lavr: Add x86-optimized functions for s32 to s16 conversion
  lavr: Add x86-optimized functions for s16 to flt conversion
  lavr: Add x86-optimized function for s16 to s32 conversion
  rtpenc: Support packetizing iLBC
  rtpdec: Add a depacketizer for iLBC
  Implement the iLBC storage file format
  mov: Support muxing/demuxing iLBC
  ...

Conflicts:
	Changelog
	configure
	libavcodec/avcodec.h
	libavcodec/dsputil.c
	libavcodec/version.h
	libavformat/movenc.c
	libavformat/mpegts.c
	libavformat/version.h
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-19 20:53:27 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
libpostproc
libswresample swr: introduce filter_alloc in preparation of SIMD resample optimisations 2012-06-19 03:09:24 +02:00
libswscale sws/swscale_unscaled: use av_assert 2012-06-16 17:34:07 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-06-18 20:07:00 +02:00
tools
.gitignore Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
Doxyfile
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: reorganize entries in the libavfilter section 2012-06-17 22:17:44 +02:00
Makefile
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
ffmpeg.c ffmpeg.c: count subtitles in total size. 2012-06-18 09:40:01 +02:00
ffplay.c ffplay: fix -vismv 1 2012-06-17 21:36:58 +02:00
ffprobe.c ffprobe: dump AVPacket.convergence_duration. 2012-06-18 09:39:17 +02:00
ffserver.c
library.mak
version.sh

README

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.