Go to file
Michael Niedermayer 034fc7bf12 Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
  configure: enable memalign_hack automatically when needed
  swscale: unbreak the build on non-x86 systems.
  swscale: remove if(bitexact) branch from functions.
  swscale: remove if(canMMX2BeUsed) conditional.
  swscale: remove swScale_{c,MMX,MMX2} duplication.
  swscale: use emms_c().
  Move emms_c() from libavcodec to libavutil.
  tiff: set palette in the context when specified in TIFF_PAL tag
  rtsp: use strtoul to parse rtptime and seq values.
  pgssubdec: fix incorrect colors.
  dvdsubdec: fix incorrect colors.
  ape: Allow demuxing of files with metadata tags.
  swscale: remove dead macro WRITEBGR24OLD.
  swscale: remove AMD3DNOW "optimizations".
  swscale: remove duplicate code in ppc/ subdirectory.
  swscale: remove duplicated x86/ functions.
  swscale: force --enable-runtime-cpudetect and remove SWS_CPU_CAPS_*.
  vsrc_buffer.h: add file doxy
  vsrc_buffer: tweak error message in init()
  msmpeg4: reindent.
  ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-25 06:32:45 +02:00
doc Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +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-25 06:32:45 +02:00
libavdevice DirectShow capture: Fix build 2011-05-21 21:53:15 +02:00
libavfilter Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
libpostproc Merge remote branch 'qatar/master' 2011-05-09 04:50:56 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-05-25 06:32:45 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-05-21 03:11:50 +02:00
tests swscale: dont loose bits on planar >8bit yuv ind gray nput. 2011-05-25 04:08:34 +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: bump minor and add changelog entry after the split filter addition 2011-05-22 02:43:48 +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 preset dir for win32 2011-05-21 03:36:26 +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-25 06:32:45 +02:00
COPYING.GPLv2 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1. 2009-06-05 09:51:31 +00:00
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 ffmpeg: Don't trigger url_interrupt_cb on the first signal 2011-05-22 22:06:20 +03:00
ffplay.c Add support for request_sample_format in ffmpeg and ffplay. 2011-05-18 17:27:06 -04:00
ffprobe.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffserver.c ffserver: dont just crash 2011-05-21 04:50:59 +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-19 06:00:31 +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.