Go to file
Michael Niedermayer 80d156d7fd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  qdm2: Use floating point synthesis filter.
  h264: correct border check.
  h264: fix loopfilter with threading at slice boundaries.
  Fix ff_mpa_synth_filter_fixed() prototype
  Rename costablegen.c ---> cos_tablegen.c.
  Collapse tableprint.c into tableprint.h.
  Simplify trig table rules
  Remove potentially unstable filenames from comments in generated files.
  Ignore generated tables and generated table generator programs.
  Simplify CLEANFILES make variable by using wildcards.
  Remove silly insults from avformat_version() Doxygen documentation.
  mpegaudiodsp: fix x86 and ppc makefiles
  configure: Adjust AVX assembler check.
  mpegaudio: remove unused version of SAME_HEADER_MASK
  mpegaudio: remove useless #undef at end of file
  asfdec: add missing #include for av_bswap32()
  mpegaudio: merge two #if CONFIG_FLOAT blocks
  mpegaudio: move some struct definitions from mpegaudio.h
  Move some mpegaudio functions to new mpegaudiodsp subsystem

Conflicts:
	libavcodec/h264.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-20 05:48:22 +02:00
doc vsrc_buffer: add av_vsrc_buffer_add_frame() 2011-05-19 23:15:34 +02:00
ffpresets Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
libavdevice Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
libavfilter vsrc_buffer: document av_vsrc_buffer_add_video_buffer_ref() 2011-05-19 23:15:34 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
libavutil eval: opensolaris strtod() cannot handle 0x1234 2011-05-18 00:01:40 +02:00
libpostproc Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
libswscale swscale: fix compile on mingw32 2011-05-14 13:22:46 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
tools Merge remote branch 'qatar/master' 2011-05-17 04:51:33 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
Changelog update changelog with 9/10 bit H264 and FFV1 changes 2011-05-16 23:30:41 -04:00
cmdutils_common_opts.h Implement a -pix_fmts option for listing all the supported pixel 2009-12-21 21:53:03 +00:00
cmdutils.c cmdutils: Allocate private decoder context if its not allocated yet. 2011-05-16 21:26:18 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2011-05-19 13:00:31 +02:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c vsrc_buffer: add av_vsrc_buffer_add_frame() 2011-05-19 23:15:34 +02:00
ffplay.c Add support for request_sample_format in ffmpeg and ffplay. 2011-05-18 17:27:06 -04:00
ffprobe.c ffprobe: tweak error message in open_input_file() 2011-05-12 13:03:10 +02:00
ffserver.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-05-19 06:00:31 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

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

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

* Read the documentation in the doc/ directory.

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

* See the LICENSE file.