FFmpeg git repo
Go to file
Michael Niedermayer 5231eecdaf Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Deprecate obsolete XvMC hardware decoding support

Conflicts:
	libavcodec/mpeg12.c
	libavcodec/mpeg12dec.c
	libavcodec/mpegvideo.c
	libavcodec/options_table.h
	libavutil/pixdesc.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14 03:26:35 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-07 23:39:31 +01:00
doc Merge remote-tracking branch 'qatar/master' 2013-11-14 03:26:35 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-11-14 03:26:35 +01:00
libavdevice lavd/xv: fix memory leak 2013-11-13 11:34:19 +01:00
libavfilter lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
libavformat avformat/nullenc: mark null as VFPS 2013-11-13 22:56:18 +01:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-11-14 03:26:35 +01:00
libpostproc
libswresample lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale lsws/utils: introduce scale_algorithms array 2013-11-05 14:01:53 +01:00
presets
tests FATE: Add HEVC tests 2013-10-31 20:20:16 +01:00
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Changelog lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
INSTALL
LICENSE
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2013-11-04 01:20:46 +01:00
README
RELEASE
arch.mak
cmdutils.c
cmdutils.h
cmdutils_common_opts.h
common.mak
configure Merge commit '16381923fb7b9087ce559fb1cd3594469ac6788b' 2013-11-14 02:34:34 +01:00
ffmpeg.c ffmpeg: remove unneeded include "libswscale/swscale.h" 2013-11-10 21:45:19 +01:00
ffmpeg.h ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct 2013-11-09 19:05:34 +01:00
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: fix overriding values set by -target 2013-11-13 22:07:19 +01:00
ffplay.c ffplay: add smarter method for determining video picture duration 2013-11-05 21:27:07 +01:00
ffprobe.c
ffserver.c
library.mak
version.sh

README

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.