generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,071 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%
5f231d909f
Go to file
Michael Niedermayer 5f231d909f Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118' 
* commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118':
  vdpau: add a convenience function for getting a decoder profile.

Conflicts:
	doc/APIchanges
	libavcodec/vdpau.c
	libavcodec/vdpau.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-14 13:00:10 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-07 23:39:31 +01:00
doc Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118' 2013-11-14 13:00:10 +01:00
libavcodec Merge commit 'ca22d1dea2842fca0422dd1d2bd09e7eb2c8f118' 2013-11-14 13:00:10 +01:00
libavdevice lavd/xv: fix memory leak 2013-11-13 11:34:19 +01:00
libavfilter lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
libavformat avformat/nullenc: mark null as VFPS 2013-11-13 22:56:18 +01:00
libavresample Merge commit '211ca69b13eb0a127a9ef7e70ddaccdab125d1c5' 2013-10-28 09:59:53 +01:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-11-14 03:26:35 +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: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale lsws/utils: introduce scale_algorithms array 2013-11-05 14:01:53 +01:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests fate: Add VCR2 test 2013-11-14 08:49:31 +01:00
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore doc/examples: rename demuxing to demuxing_decoding. 2013-11-04 12:53:06 +01:00
arch.mak Merge commit 'b326755989b346d0d935e0628e8865f9b2951c30' 2012-12-08 14:24:16 +01:00
Changelog lavfi: add elbg filter 2013-11-13 11:21:57 +01:00
cmdutils_common_opts.h cmdutils: add -colors option 2013-10-27 09:18:45 +01:00
cmdutils.c cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
cmdutils.h cmdutils: fix expected signature for show_colors() function 2013-10-28 09:41:25 +01:00
common.mak Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050' 2013-10-04 11:49:01 +02:00
configure Merge commit '16381923fb7b9087ce559fb1cd3594469ac6788b' 2013-11-14 02:34:34 +01:00
COPYING.GPLv2
COPYING.GPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3 Add configure option to upgrade (L)GPL to version 3. 2009-06-05 11:04:03 +00:00
CREDITS CREDITS: redirect to Git log, remove current outdated content 2013-01-31 18:02:52 +01:00
ffmpeg_filter.c ffmpeg_filter: Fix non jpeg yuv in jpeg support 2013-10-27 17:41:06 +01:00
ffmpeg_opt.c ffmpeg_opt: fix overriding values set by -target 2013-11-13 22:07:19 +01:00
ffmpeg.c ffmpeg: remove unneeded include "libswscale/swscale.h" 2013-11-10 21:45:19 +01:00
ffmpeg.h ffmpeg: store value of -filter and -filter_script per-stream option in OutputStream struct 2013-11-09 19:05:34 +01:00
ffplay.c ffplay: add smarter method for determining video picture duration 2013-11-05 21:27:07 +01: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 Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
library.mak build: remove pointless condition 2013-10-29 14:00:29 +00:00
LICENSE libavfilter/vf_noise: relicense to LGPL 2013-10-27 20:29:07 +00:00
MAINTAINERS MAINTAINERS: Add 1.2 back to the maintained releases 2013-11-12 14:33:54 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2013-11-04 01:20:46 +01: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.