FFmpeg git repo
Go to file
Michael Niedermayer e4de71677f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aac_latm: reconfigure decoder on audio specific config changes
  latmdec: fix audio specific config parsing
  Add avcodec_decode_audio4().
  avcodec: change number of plane pointers from 4 to 8 at next major bump.
  Update developers documentation with coding conventions.
  svq1dec: avoid undefined get_bits(0) call
  ARM: h264dsp_neon cosmetics
  ARM: make some NEON macros reusable
  Do not memcpy raw video frames when using null muxer
  fate: update asf seektest
  vp8: flush buffers on size changes.
  doc: improve general documentation for MacOSX
  asf: use packet dts as approximation of pts
  asf: do not call av_read_frame
  rtsp: Initialize the media_type_mask in the rtp guessing demuxer
  Cleaned up alacenc.c

Conflicts:
	doc/APIchanges
	doc/developer.texi
	libavcodec/8svx.c
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/nellymoserdec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/wmadec.c
	libavformat/asfdec.c
	tests/ref/seek/lavf_asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-03 03:00:30 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-12-03 03:00:30 +01:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-12-03 03:00:30 +01:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
libavfilter avfilter: align allocated images to 32 for AVX and IFF 2011-11-30 18:53:47 +01:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-12-03 03:00:30 +01:00
libavutil libavutil: increase struct SampleFmtInfo member 'name' length to 8 2011-12-03 00:35:20 +01:00
libpostproc postproc: remove stray + 2011-10-30 18:11:09 +01:00
libswresample swr-test: drop one const, silence most const qualifer warnings. 2011-12-03 00:46:46 +01:00
libswscale swscale: Fix all cast qualifier warnings: 2011-12-03 00:12:56 +01:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests fate: update asf seektest 2011-12-02 16:43:05 +01:00
tools lavfi-showfiltfmts.c: fix handling of null names 2011-11-26 18:12:25 +01:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-12-03 03:00:30 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
cmdutils_common_opts.h
cmdutils.c cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
cmdutils.h cmdutils: pass AVCodec to filter_codec_opts() 2011-11-27 21:17:56 +01:00
common.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
configure configure: add forgotten libx264rgb_encoder_deps 2011-12-01 22:29:58 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-12-03 03:00:30 +01:00
ffplay.c ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586) 2011-12-01 20:55:01 +01:00
ffprobe.c ffprobe: print codec timecode if available. 2011-11-28 14:06:02 +01:00
ffserver.c ffserver: use av_noreturn 2011-11-11 04:25:53 +01:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: add myself as a web site maintainer 2011-11-21 00:07:52 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
README
RELEASE RELEASE: We're now at 0.8.7.git 2011-11-25 14:37:35 +01:00
subdir.mak Add rule for compiling to asm 2011-10-22 20:49:24 +02:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.