1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer c2555bcbd1 Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565'
* commit 'be1e1373d267bae2af8a62d79eef736736f24565':
  flvenc: Support muxing VP6A as well

Conflicts:
	libavformat/flvenc.c

See: 42ae83c196
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-10 11:58:58 +02:00
compat
doc doc/filters: remove extra spacing in vid.stab section. 2013-10-09 13:22:04 +02:00
libavcodec Merge commit '41a10f3ba149a2012de499d0b4ad4955d81f28d5' 2013-10-10 11:38:36 +02:00
libavdevice lavd/xv.c: Include XShm.h before Xvlib.h. 2013-10-09 19:01:11 +02:00
libavfilter avfilter/buffersink: try to fix AV_NOPTS_VALUE 2013-10-09 16:33:18 +02:00
libavformat Merge commit 'be1e1373d267bae2af8a62d79eef736736f24565' 2013-10-10 11:58:58 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2013-10-09 14:29:42 +02:00
libpostproc
libswresample x86: Fix compilation with nasm on PPC & OS/2 2013-10-08 12:36:19 +02:00
libswscale Merge commit '6b3ff6f91a535d6383f41ca7bdf760165dcb6015' 2013-10-06 11:44:05 +02:00
presets
tests fate: fix dpx on big endian 2013-10-06 15:22:18 +02:00
tools Merge remote-tracking branch 'qatar/master' 2013-10-05 11:35:39 +02:00
.gitignore
arch.mak
Changelog lavd: pulse audio encoder 2013-10-08 14:31:50 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050' 2013-10-04 11:49:01 +02:00
configure Merge commit '9e3946aadaef6f7d7ef15c31b5ff1e73d0ba79a1' 2013-10-09 14:17:56 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding. 2013-10-07 23:58:59 +02:00
ffmpeg.c ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding. 2013-10-07 23:58:59 +02:00
ffmpeg.h ffmpeg: add max_error_rate to allow tuning the point decoding errors are considered a failure of the whole transcoding. 2013-10-07 23:58:59 +02:00
ffplay.c ffplay: avoid direct access to lowres use av_codec_g/set_lowres() 2013-10-03 22:38:54 +02:00
ffprobe.c
ffserver.c ffserver: strip odd chars from html error messages before sending them back 2013-10-09 00:30:46 +02:00
INSTALL
library.mak Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80' 2013-10-08 10:45:37 +02:00
LICENSE
MAINTAINERS MAINTAINERS: add Communication section 2013-10-09 04:04:38 +02:00
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.