FFmpeg git repo
Go to file
Michael Niedermayer e3e09f2bad Merge remote-tracking branch 'qatar/master'
* qatar/master:
  os_support: Choose between direct.h and io.h using a configure check
  os_support: Include io.h instead of direct.h on mingw32ce
  x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared
  swscale: Remove two bogus asserts
  ac3: move ac3_downmix() from dsputil to ac3dsp
  lavr/audio_mix_matrix: acknowledge the existence of LFE2.
  mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel.
  lavu/audioconvert: add a second low frequency channel.

Conflicts:
	doc/APIchanges
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h
	libavcodec/mlp_parser.c
	libavutil/audioconvert.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-13 15:35:50 +02:00
compat
doc Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
libavdevice lavd/lavfi: apply stylistic fixes to the options help fields 2012-09-11 22:56:35 +02:00
libavfilter lavfi/aresample: set buffer properties after copy. 2012-09-13 12:05:19 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
libpostproc postproc: Fix unprotected inline asm 2012-09-11 20:12:14 +02:00
libswresample
libswscale Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-09-10 14:06:20 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 2012-09-13 15:22:16 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c ffmpeg_filter: fix unsafe snprintf() usage 2012-09-09 14:11:03 +02:00
ffmpeg_opt.c
ffmpeg.c ffmpeg: Only include unistd.h if it exists 2012-09-11 22:59:43 +02:00
ffmpeg.h
ffplay.c ffplay: increase sample array buffer 2012-09-11 22:15:38 +02:00
ffprobe.c ffprobe: print start_pts and duration_ts stream information 2012-09-12 10:22:29 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-09-12 11:46:47 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
version.sh

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.