1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 9fd5e75bdf Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a'
* commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a':
  vc1_parser: Set field_order.
  mpegvideo_parser: Set field_order.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-03 13:03:00 +02:00
compat
doc Merge commit '507b1e454cf9953da3e18f33c9bd1fca78c97cb5' 2013-05-03 12:15:01 +02:00
libavcodec Merge commit 'accde1bd8756936e1757b42fc9bad2eb5d192f8a' 2013-05-03 13:03:00 +02:00
libavdevice
libavfilter lavfi/blend: merge config_input_top into config_output 2013-05-02 12:22:18 +00:00
libavformat Merge commit '13f57a4d881ec669b87bf82f424bfff502433060' 2013-05-03 11:06:27 +02:00
libavresample
libavutil Merge commit '566b7a20fd0cab44d344329538d314454a0bcc2f' 2013-05-03 11:57:59 +02:00
libpostproc
libswresample
libswscale Merge commit '7f75f2f2bd692857c1c1ca7f414eb30ece3de93d' 2013-05-01 18:21:35 +02:00
presets
tests Merge commit 'b333f3a22a4db4cf65d6a0457ac82ecbe7c7ac44' 2013-05-03 11:41:48 +02:00
tools
.gitignore
arch.mak
Changelog Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 2013-05-01 17:24:43 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'ffb068ce8e99df121d18a5b9b1d820f3ea8697fb' 2013-05-03 11:17:02 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge commit '8cd472d3f947a6233e7dc628f0dc71c74e62413a' 2013-05-01 17:24:43 +02:00
ffmpeg_opt.c Merge commit '3d624420086ed3cd0c74f4510f0285968e21c117' 2013-05-01 12:09:07 +02:00
ffmpeg.c ffmpeg: fix segfault with random output 2013-05-02 16:01:28 +02:00
ffmpeg.h
ffplay.c Merge commit '26a44143efb513a602542fb59aee87b1fc62af51' 2013-04-28 12:03:41 +02:00
ffprobe.c
ffserver.c
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.