1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer 1a6a088f7c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: whitespace cosmetics
  fate: split off video codec FATE tests into their own file
  fate: split off audio codec FATE tests into their own file
  fate: split off Electronic Arts codec FATE tests into their own file
  fate: split off QuickTime codec FATE tests into their own file
  fate: split off voice codec FATE tests into their own file
  fate: split off demuxer FATE tests into their own file
  cosmetics: Drop unnecessary parentheses around return values.
  fate: drop pointless _audio and _video suffixes from xan tests
  qt-faststart: K&R reformatting; fix comment typos
  FATE: Add test for H.264 MP4->annex.B bitstream filter.

Conflicts:
	ffplay.c
	tests/fate.mak
	tests/fate/h264.mak
	tests/fate/image.mak
	tests/fate/lossless-audio.mak
	tests/fate/lossless-video.mak
	tests/fate/qtrle.mak
	tests/fate/real.mak
	tests/fate/screen.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-31 01:16:45 +01:00
doc Merge remote-tracking branch 'qatar/master' 2011-12-30 03:46:24 +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-31 01:16:45 +01:00
libavdevice v4l2: remove unneded linux specific asm/types.h include 2011-12-27 16:07:58 +01:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-12-31 01:16:45 +01:00
libavformat flvdec: Add comment about the 5 second threshold 2011-12-30 20:34:55 +01:00
libavutil Avoid av_memcpy_backptr hang without extra branch. 2011-12-30 10:37:33 +01:00
libpostproc libpostproc: increase LIBPOSTPROC_VERSION_MICRO to 100 2011-12-22 03:07:13 +01:00
libswresample swr: fix swresample_version() 2011-12-23 23:26:02 +01:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-12-27 01:19:18 +01:00
mt-work
presets Remove redundant libx264 preset files 2011-10-22 01:32:10 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-12-31 01:16:45 +01:00
tools Merge remote-tracking branch 'qatar/master' 2011-12-31 01:16:45 +01:00
.gitignore doc: fate: Support building a plain text version 2011-12-20 16:05:01 +01:00
avconv.c Merge remote-tracking branch 'qatar/master' 2011-12-30 03:46:24 +01:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-12-29 01:40:34 +01:00
cmdutils_common_opts.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2011-12-31 01:16:45 +01:00
cmdutils.h ff*: add -max_alloc command line option 2011-12-25 18:55:43 +01:00
common.mak Add coverage support. 2011-12-05 20:04:48 +01:00
configure Make sure configure does not fail just because unneeded third-party options are used. 2011-12-30 19:20:39 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile Merge remote-tracking branch 'qatar/master' 2011-12-26 04:10:47 +01:00
ffmpeg.c Merge remote-tracking branch 'qatar/master' 2011-12-30 03:46:24 +01:00
ffplay.c ff* tools: move descriptions from copyright header to @file doxy 2011-12-27 12:58:08 +01:00
ffprobe.c ffprobe: add XML writer 2011-12-27 12:58:24 +01:00
ffserver.c ff* tools: move descriptions from copyright header to @file doxy 2011-12-27 12:58:08 +01:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2011-12-18 03:04:44 +01:00
LICENSE
MAINTAINERS v410 encoder and decoder 2011-12-14 03:38:57 +01:00
Makefile Makefile: fix path to ffprobe.xsd 2011-12-27 22:29:40 +01:00
README
RELEASE Prepare for 0.8_beta1 snapshot release 2011-12-23 15:38:15 +01:00
version.sh

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.