1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer bbc7d33a0d Merge commit '582963a8156522582e55466be4a59974a8d909a5'
* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
	libavcodec/vdpau_vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-26 10:51:42 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc doc/encoders: partially rewrite and reformat libx264 docs 2013-07-24 16:29:12 +02:00
libavcodec Merge commit '582963a8156522582e55466be4a59974a8d909a5' 2013-07-26 10:51:42 +02:00
libavdevice
libavfilter avfilter/can_merge_formats: fix memleak 2013-07-25 16:54:04 +02:00
libavformat Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3' 2013-07-26 10:43:12 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
libavutil lavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and AV_OPT_TYPE_SAMPLE_FMT too 2013-07-25 20:41:39 +00:00
libpostproc
libswresample swresample: fix negative rematrix volumns 2013-07-22 03:24:22 +02:00
libswscale swscale/sws_getColorspaceDetails: dont fail for non yuv 2013-07-25 02:50:46 +02:00
presets
tests avformat/gxfenc: Added support for writing correct auxiliary data for DV streams. 2013-07-25 22:01:12 +02:00
tools
.gitignore
arch.mak
Changelog
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Allow native compilation on the iPhone. 2013-07-25 19:08:19 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: improve error message in case of failure, mention filtergraph configuration 2013-07-21 19:20:46 +02:00
ffprobe.c
ffserver.c Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
README
RELEASE
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.