Go to file
Michael Niedermayer 088f20a332 Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0'
* commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0':
  h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil

Conflicts:
	libavcodec/dsputil.c
	libavcodec/h264.c
	libavcodec/h264_mb_template.c
	libavcodec/h264addpx_template.c
	libavcodec/h264dsp.c
	libavcodec/h264dsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-20 11:17:32 +01:00
compat
doc lavfi/histogram: overlay display mode for levels histogram mode 2013-02-18 20:13:07 +00:00
libavcodec Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0' 2013-02-20 11:17:32 +01:00
libavdevice v4l2: try to fix build on BSD 2013-02-18 00:53:17 +01:00
libavfilter avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha 2013-02-19 15:00:01 +01:00
libavformat nutenc: only write an index if there are syncpoints 2013-02-18 20:51:54 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-02-13 12:58:29 +01:00
libavutil x86: Use simple nop codes for <= sse (rather than <= mmx) 2013-02-19 22:33:19 +02:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample swr: check channel layouts before using them. 2013-02-13 17:50:24 +01:00
libswscale sws/x86: improve rounding for yuv2yuvX 2013-02-15 23:33:04 +01:00
presets
tests cinepak: Use correct colorspace. 2013-02-20 04:13:33 +01: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 lavc: support subtitles character encoding conversion. 2013-02-17 12:57:56 +01:00
cmdutils_common_opts.h
cmdutils.c Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793' 2013-02-16 13:13:42 +01:00
cmdutils.h lavf: remove nonexistent symbols 2013-01-11 10:07:52 +00:00
common.mak
configure h264: add videodsp dependency. 2013-02-20 02:12:26 +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: Check for parameter changes at the output of the audio filter graph 2013-02-14 23:56:51 +01:00
ffmpeg.h ffmpeg: implement -force_key_frames expression evalution 2013-01-27 16:56:47 +01:00
ffplay.c ffplay: only display frames if there are no pending events 2013-02-15 13:12:10 +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: 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
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.