generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
57,101 Commits 24 Branches 241 Tags 173 MiB
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%
43dec5ef9a
Go to file
Michael Niedermayer 43dec5ef9a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  indeo4: Check the inherited quant_mat

Conflicts:
	libavcodec/indeo4.c

See: 884efd4e09
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-13 10:38:51 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc doc/codecs: Add missing mpeg2 aac profiles 2013-10-11 20:00:06 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2013-10-13 10:38:51 +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 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 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 presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge commit '364af376f343d4706c4cdb7ab9fe0863994e6c01' 2013-10-13 08:01:56 +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 oggdec: add support for Opus in Ogg demuxing 2013-10-12 15:25:18 +02:00
cmdutils_common_opts.h cmdutils_common_opts: fix indention of #if 2013-04-11 16:07:46 +02:00
cmdutils.c cmdutils: print command support in -filters. 2013-09-30 10:15:22 +00:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
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 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
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: check that the input media type match the filter 2013-08-14 03:03:41 +02:00
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 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 Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak Merge commit 'e52567c2954f627d420b30f75f71af2f2e4afe80' 2013-10-08 10:45:37 +02:00
LICENSE avfilter: port pullup filter from libmpcodecs 2013-09-17 17:03:36 +00:00
MAINTAINERS MAINTAINERS: add Communication section 2013-10-09 04:04:38 +02: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 version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

README 

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.