1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer cdb9752a0f Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e'
* commit '845cfc92f908791714b8c4c8a49c91b8c64b685e':
  x86: dsputil: Drop aliasing of ff_put_pixels8_mmx to ff_put_pixels8_mmxext

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Note, the commit message is wrong, there are no mmxext instructions as
claimed in the function. The change should do no harm though

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-27 12:22:10 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc ffmpeg_opt: add -to option to specify stop time 2013-02-27 02:17:42 +01:00
libavcodec Merge commit '845cfc92f908791714b8c4c8a49c91b8c64b685e' 2013-02-27 12:22:10 +01:00
libavdevice v4l2: try to fix build on BSD 2013-02-18 00:53:17 +01:00
libavfilter lavfi/hflip: support more formats 2013-02-25 13:07:29 +00:00
libavformat oggdec: chained oggs have timestamp discontinuities 2013-02-27 03:46:12 +01:00
libavresample Merge commit '45235ac488363e3360bf2f2275102d1ec66eba0f' 2013-02-24 17:45:06 +01:00
libavutil Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855' 2013-02-24 12:22:51 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample swr: make the default of nopts for first_pts actually work 2013-02-25 04:39:26 +01:00
libswscale swscale-test: fix 3 pointer type warnings 2013-02-26 16:50:32 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: update pixfmts_hflip 2013-02-25 13:16:44 +00:00
tools tools: add seek_print. 2013-02-24 13:12:46 +01:00
.gitignore tools: add seek_print. 2013-02-24 13:12:46 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog blend filter 2013-02-21 20:16:23 +00:00
cmdutils_common_opts.h cmdutils: implement debug/fdebug log level update differently. 2012-12-20 02:38:18 +01:00
cmdutils.c Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655' 2013-02-26 12:50:34 +01:00
cmdutils.h ffmpeg: use a AVDictionary instead of the context to move swr parameters around 2013-02-24 20:31:56 +01:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure Merge remote-tracking branch 'qatar/master' 2013-02-26 13:13:10 +01: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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg: Force a first_pts of 0 for the first configuration of -async use 2013-02-25 04:39:26 +01:00
ffmpeg_opt.c ffmpeg_opt: add -to option to specify stop time 2013-02-27 02:17:42 +01:00
ffmpeg.c ffmpeg: use a AVDictionary instead of the context to move swr parameters around 2013-02-24 20:31:56 +01:00
ffmpeg.h ffmpeg_opt: add -to option to specify stop time 2013-02-27 02:17:42 +01:00
ffplay.c ffplay: reindent and remove pointless cast in audio_decode_frame() code 2013-02-24 23:29:42 +01:00
ffprobe.c ffprobe: do not escape '"' between single quotes. 2013-01-01 13:32:51 +01:00
ffserver.c ffserver: add missing padding to extradata. 2012-12-30 22:22:18 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: fixes a "can't cd to..." issue when installing shared libraries. 2013-02-15 08:39:35 +01:00
LICENSE lavfi: port MP noise filter 2013-02-16 11:42:41 +00:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile build: Add proper infrastructure for adding and checking host CPPFLAGS 2013-02-23 20:23:45 +01:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.