1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Go to file
Michael Niedermayer fe54f6cb45 Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3'
* commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3':
  h264: Copy h264chroma dsp context to slice thread copies
  swscale: Disallow conversion to GBRP16

Conflicts:
	libswscale/utils.c
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 13:18:28 +01:00
compat
doc doc/filters: rework idet filter description 2013-02-11 23:43:37 +01:00
libavcodec Merge commit '4c51fe48ba6dde059360b7451db7f6bbf2f11db3' 2013-02-12 13:18:28 +01:00
libavdevice lavd/v4l2: fix error logic when enumerating standards 2013-02-10 20:59:06 +01:00
libavfilter lavfi/amerge: make description consistent with documentation 2013-02-11 14:43:23 +00:00
libavformat Print mxf Universal Label if the user requested verbose logging. 2013-02-11 13:11:16 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-01-18 13:54:38 +01:00
libavutil Merge commit '62a43d30cc3b9b2460f2c926beb522df32493625' 2013-02-12 13:11:14 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample swr: Dont use floats for S32->S32 when possible 2013-02-04 04:11:46 +01:00
libswscale swscale: Disallow conversion to GBRP16 2013-02-11 20:03:16 +02:00
presets
tests swscale: Disallow conversion to GBRP16 2013-02-11 20:03:16 +02:00
tools Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f' 2013-01-23 17:44:56 +01:00
.gitignore .gitignore: add /doc/examples/pc-uninstalled 2013-01-17 17:59:18 +00:00
arch.mak
Changelog Merge commit 'f5fac6f77752931347ab302563802dcaa49c2419' 2013-02-10 13:06:16 +01: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 '89f11f498b9c15bc71494a11a7ec560f4adf630d' 2013-02-06 15:57:45 +01:00
cmdutils.h lavf: remove nonexistent symbols 2013-01-11 10:07:52 +00:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
configure Merge commit '79dad2a932534d1155079f937649e099f9e5cc27' 2013-02-07 13:09:35 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg: support filtering of unknown channel layouts. 2013-01-26 11:15:38 +01:00
ffmpeg_opt.c ffmpeg: dont allow -flags to override -pass 2013-02-06 01:26:26 +01:00
ffmpeg.c ffmpeg: fix streamcopy of lsf mp3. 2013-02-12 00:38:22 +01:00
ffmpeg.h ffmpeg: implement -force_key_frames expression evalution 2013-01-27 16:56:47 +01:00
ffplay.c Revert "Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'" 2013-02-10 14:27:57 +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
library.mak build: Remove superfluous MAKE variable for the build suffix 2013-02-03 13:08:36 +01:00
LICENSE lavfi: add histeq filter 2013-01-05 10:25:32 +01:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-12-11 08:24:45 +01:00
README
RELEASE RELEASE: 1.1.git for master 2013-01-06 21:42:35 +01:00
version.sh

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.