1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Go to file
Michael Niedermayer d3850ac5b9 Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0'
* commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0':
  indeo4: Check the block size if reusing the band configuration

Conflicts:
	libavcodec/indeo4.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 10:19:15 +02:00
compat
doc doc/codecs: Add missing mpeg2 aac profiles 2013-10-11 20:00:06 +02:00
libavcodec Merge commit '0cb83c563848bf8f8365e7bd30e7e6b57ef360f0' 2013-10-13 10:19:15 +02:00
libavdevice avdevice/pulse_audio_enc: fix stream index 2013-10-12 13:52:26 +02:00
libavfilter avfilter/vsrc_testsrc: smpte(hd)bars: use yuv directly 2013-10-12 18:40:15 +00:00
libavformat Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937' 2013-10-13 10:06:42 +02:00
libavresample Merge commit 'df6737a55f5dc7c0ae5272bc5fa6182836d5481c' 2013-10-13 06:48:35 +02:00
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 swscale: Use full resolution chroma for yuv2rgb when the input has full chroma 2013-10-10 17:28:59 +02:00
presets
tests Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01' 2013-10-13 08:01:56 +02:00
tools
.gitignore
arch.mak
Changelog oggdec: add support for Opus in Ogg demuxing 2013-10-12 15:25:18 +02:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
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: set the source_index for trivial filter graphs 2013-10-11 00:51:09 +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
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.