1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Go to file
Michael Niedermayer 8381ab1437 Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  ARM: disable ff_vector_fmul_vfp on VFPv3 systems
  ARM: check for VFPv3
  swscale: Remove unused variables in x86 code.
  doc: Drop DJGPP section, Libav now compiles out-of-the-box on FreeDOS.
  x86: Add appropriate ifdefs around certain AVX functions.
  cmdutils: use sws_freeContext() instead of av_freep().
  swscale: delay allocation of formatConvBuffer().
  swscale: fix build with --disable-swscale-alpha.
  movenc: Deprecate the global RTP hinting flag, use a private AVOption instead
  movenc: Add an AVClass for setting muxer specific options
  swscale: fix non-bitexact yuv2yuv[X2]() MMX/MMX2 functions.
  configure: report yasm/nasm presence properly
  tcp: make connect() timeout properly
  rawdec: factor video demuxer definitions into a macro.
  rtspdec: add initial_pause private option.
  lavf: deprecate AVFormatParameters.width/height.
  tty: add video_size private option.
  rawdec: add video_size private option.
  x11grab: add video_size private option.
  x11grab: factorize returning error codes.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-27 23:48:22 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +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-27 23:48:22 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
libavfilter lavfi: add select filter 2011-05-25 12:54:07 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
libavutil avopt: fix segfault 2011-05-27 16:55:07 +02:00
libpostproc Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
libswscale swscale: Remove unused variables in x86 code. 2011-05-27 21:25:57 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-05-21 03:11:50 +02:00
tests swscale: dont loose precission on RGB/BGR48 input, that is dont drop half the bits. 2011-05-27 13:21:17 +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 lavfi: add select filter 2011-05-25 12:54:07 +02: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 Merge remote-tracking branch 'qatar/master' 2011-05-27 23:48:22 +02:00
cmdutils.h multiple inclusion guard cleanup 2011-05-21 13:48:10 +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-27 23:48:22 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
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 Merge remote-tracking branch 'qatar/master' 2011-05-27 02:53:21 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2011-05-27 02:53:21 +02:00
ffprobe.c ffprobe: tweak error message in open_input_file() 2011-05-12 13:03:10 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-05-27 02:53:21 +02:00
ffserver.h multiple inclusion guard cleanup 2011-05-21 13:48:10 +02:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2011-05-27 02:53:21 +02:00
README cosmetics: fix dashed line length after 070c5d0 2011-03-28 09:53:40 +02:00
subdir.mak Remove avconfig.h and INCINSTDIRs on uninstall. 2011-05-24 10:09:45 +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.