1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Go to file
Michael Niedermayer 7f22df3a49 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  shorten: Extend fixed_coeffs to properly support pred_order 0

Conflicts:
	libavcodec/shorten.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-09 11:04:06 +02:00
compat
doc doc/default.css + doc/t2h.init: New styles 2013-10-09 04:01:46 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-10-09 11:04:06 +02:00
libavdevice Add pulse_audio_common.h to skipheaders. 2013-10-09 09:39:57 +02:00
libavfilter avfilter/af_join: remove now unnecessary goto 2013-10-08 12:40:33 +00:00
libavformat avformat/movenc: factor out find_fps() 2013-10-08 14:18:43 +02:00
libavresample
libavutil Merge commit '3e2fa991db7ef172579422accd61624d52777e5a' 2013-10-08 12:02:21 +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 lavd: pulse audio encoder 2013-10-08 14:31:50 +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 ffprobe: print stream channel_layout when available 2013-10-03 09:19:38 +02:00
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.