1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Go to file
Michael Niedermayer b361a0bf1f Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c'
* commit 'f7518f1a0e0a1788c303de3c6198da07e575710c':
  codec_desc: update dvaudio tag

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 14:53:05 +01:00
compat
doc Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' 2014-03-17 14:41:13 +01:00
libavcodec Merge commit 'f7518f1a0e0a1788c303de3c6198da07e575710c' 2014-03-17 14:53:05 +01:00
libavdevice
libavfilter avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2) 2014-03-16 17:25:54 +01:00
libavformat isom: fix C99-style declaration 2014-03-16 23:05:48 +01:00
libavresample
libavutil Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' 2014-03-17 14:41:13 +01:00
libpostproc
libswresample
libswscale Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30' 2014-03-17 14:41:13 +01:00
presets
tests avformat/movenc: only ommit encoder tag of the metadata for bitexact mode 2014-03-16 16:26:35 +01:00
tools
.gitignore
arch.mak
Changelog Changelog: move post 2.2 branching entries out of the 2.2 changelog 2014-03-16 19:15:58 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'be039278b5ebd8075d90a3508db2aed5adf59e02' 2014-03-17 13:23:48 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams 2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix printing INT64_MIN pts at the end 2014-03-16 06:26:40 +01:00
ffmpeg.h
ffplay.c
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.