1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer ec7ecb8811 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  dca: Switch dca_sample_rates to avpriv_ prefix; it is used across libs
  ARM: use =const syntax instead of explicit literal pools
  ARM: use standard syntax for all LDRD/STRD instructions
  fft: port FFT/IMDCT 3dnow functions to yasm, and disable on x86-64.
  dct-test: allow to compile without HAVE_INLINE_ASM.
  x86/dsputilenc: bury inline asm under HAVE_INLINE_ASM.
  dca: Move tables used outside of dcadec.c to a separate file.
  dca: Rename dca.c ---> dcadec.c
  x86: h264dsp: Remove unused variable ff_pb_3_1
  apetag: change a forgotten return to return 0

Conflicts:
	libavcodec/Makefile
	libavcodec/dca.c
	libavcodec/x86/fft_3dn.c
	libavcodec/x86/fft_3dn2.c
	libavcodec/x86/fft_mmx.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-01 23:33:06 +02:00
compat
doc ffprobe: fix validity error with tags and data. 2012-07-31 15:06:57 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-07-31 22:41:00 +02:00
libavfilter lavfi/testsrc: use AVFILTER_DEFINE_CLASS for defining the filter classes 2012-08-01 22:47:23 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-08-01 23:33:06 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-07-27 23:42:19 +02:00
libavutil timecode: show frame rate when invalid. 2012-08-01 17:36:37 +02:00
libpostproc
libswresample swr: fix 10l typo mixing in and out config. 2012-08-01 21:18:03 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2012-07-30 23:28:31 +02:00
mt-work
presets
tests tiny_psnr: fix undefined shift 2012-08-01 20:00:01 +02:00
tools
.gitignore
arch.mak
Changelog lavfi: add flite audio source 2012-07-28 11:06:43 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak buildsys: fix c++ compilation 2012-07-30 17:51:33 +02:00
configure configure: add support for dlltool when lib.exe is unavailable 2012-08-01 17:02:48 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: honor -ss and -t parameters with muxed subtitles. 2012-08-01 20:37:34 +02:00
ffplay.c
ffprobe.c ffprobe: fix validity error with tags and data. 2012-07-31 15:06:57 +02:00
ffserver.c
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-07-29 02:16:26 +02:00
LICENSE
MAINTAINERS
Makefile build: support non-standard replacements for -c flag 2012-07-28 01:50:12 +01:00
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.