1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Go to file
Michael Niedermayer d9ad305072 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fft-test: Remove possibility of returning restricted exit code
  dct-test: Remove possibility of returning a restricted exit code
  base64-test: Remove posibility of returning restricted exit codes
  tree-test: Don't return restricted exit codes

Conflicts:
	libavutil/base64.c

See: b2fdf3fc35
See: f80ca1cb00
See: cbbd0ac764
See: 5dfdffeb6f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-25 13:35:53 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc doc/issue_tracker: remove more mentions of patches 2013-10-25 12:03:35 +02:00
libavcodec avcodec/wmalosslessdec: fix data flushing at the end 2013-10-25 01:09:59 +02:00
libavdevice lavd/fbdev_common: fix compilation with older kernels 2013-10-24 21:19:52 +02:00
libavfilter avfilter/x86/vf_gradfun_init: fix const and related warnings 2013-10-24 12:12:59 +02:00
libavformat avformat/wavdec: Fix smv packet interleaving 2013-10-25 12:50:26 +02:00
libavresample Merge commit '206895708ea2b464755d340e44501daf9a07c310' 2013-10-14 15:54:23 +02:00
libavutil base64-test: Remove posibility of returning restrcted exit codes 2013-10-24 10:51:52 +01:00
libpostproc postprocess_template: put rsp on the clobber list to prevent gcc from using it in "q" 2013-06-16 18:21:39 +02:00
libswresample lswr/swresample: convert ocl and icl options to AV_OPT_TYPE_CHANNEL_LAYOUT 2013-10-17 18:09:54 +02:00
libswscale lsws: use av_pix_fmt_get_chroma_sub_sample() 2013-10-24 08:12:38 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests avcodec/hevc: remove CODEC_CAP_EXPERIMENTAL 2013-10-23 20:00:11 +02:00
tools Merge remote-tracking branch 'qatar/master' 2013-10-05 11:35:39 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavd: add fbdev output device 2013-10-24 08:16:17 +02:00
cmdutils_common_opts.h Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' 2013-10-22 19:07:28 +02:00
cmdutils.c Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' 2013-10-22 19:07:28 +02:00
cmdutils.h Merge commit 'f825d42bccdb9f89669a586951de7f66a81e80a5' 2013-10-22 19:07:28 +02:00
common.mak Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050' 2013-10-04 11:49:01 +02:00
configure lavd: add fbdev output device 2013-10-24 08:16:17 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg_filter: Pass command line -threads X to filtergraph 2013-10-24 23:15:30 +02:00
ffmpeg_opt.c make it possible to compile ffmpeg without swscale 2013-10-21 13:57:00 +00:00
ffmpeg.c ffmpeg: make stream default if its the only of its kind and no source can be unambigously assigned to it 2013-10-25 02:08:35 +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: add support for changing the channel by the C key 2013-10-13 12:46:14 +02:00
ffprobe.c ffprobe: fix consistency checks in parse_read_intervals() 2013-10-21 13:33:06 +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 build: remove pointless condition 2013-10-24 10:51:03 +01:00
LICENSE avfilter: port pullup filter from libmpcodecs 2013-09-17 17:03:36 +00:00
MAINTAINERS MAINTAINERS: update 2013-10-25 07:12:32 +00:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE Update for 2.0 2013-07-10 02:15:43 +02:00
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.