generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
47,456 Commits 24 Branches 241 Tags
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 99efd59626 Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 
* commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967':
  Remove pointless #undefs of previously forbidden functions.
  fate: Add dependencies for bmp, cdxl, dfa, mp3

Conflicts:
	doc/examples/muxing.c
	libavfilter/filtfmts.c
	libavutil/des.c
	libavutil/eval.c
	libavutil/log.c
	libavutil/parseutils.c
	tests/fate/mp3.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05 13:34:45 +01:00
compat
Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'
2012-10-24 13:42:58 +02:00
doc
lavc/dvdsubdec: accept palette from options.
2012-12-05 09:25:48 +01:00
libavcodec
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
2012-12-05 13:34:45 +01:00
libavdevice
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
2012-12-05 13:34:45 +01:00
libavfilter
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
2012-12-05 13:34:45 +01:00
libavformat
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
2012-12-05 13:34:45 +01:00
libavresample
Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563'
2012-11-28 13:27:18 +01:00
libavutil
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
2012-12-05 13:34:45 +01:00
libpostproc
pp: add SSE2 deInterlaceInterpolateCubic().
2012-11-18 16:21:59 +01:00
libswresample
lswr/swresample: use AV_OPT_TYPE_SAMPLE_FMT for sample format options
2012-12-03 13:49:56 +01:00
libswscale
swscale: fix 12 and 14 bit YUV planar output with scaling.
2012-12-01 03:41:24 +01:00
presets
presets: specify the codecs.
2012-05-04 18:40:36 +02:00
tests
Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'
2012-12-05 13:34:45 +01:00
tools
Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.h
2012-11-13 13:21:21 +00:00
.gitignore
.gitignore: ignore *.3 files as well
2012-11-06 12:24:12 +01:00
arch.mak
Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f'
2012-10-13 15:25:11 +02:00
Changelog
AST Muxer
2012-12-04 11:25:46 +00:00
cmdutils_common_opts.h
Revert "cmdutils: allow specifying the file for -report"
2012-11-04 10:47:52 +01:00
cmdutils.c
Merge remote-tracking branch 'qatar/master'
2012-11-30 14:55:12 +01:00
cmdutils.h
Revert "cmdutils: allow specifying the file for -report"
2012-11-04 10:47:52 +01:00
common.mak
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
2012-11-23 13:30:51 +01:00
configure
Merge remote-tracking branch 'qatar/master'
2012-12-04 14:23:22 +01:00
COPYING.GPLv2
Rename COPYING.GPL --> COPYING.GPLv2 and COPYING.LGPL --> COPYING.LGPLv2.1.
2009-06-05 09:51:31 +00:00
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
Revert "partially rename FFmpeg to Libav"
2011-03-17 17:26:45 +01:00
ffmpeg_filter.c
ffmpeg: fix swr filter_type for auto inserted aresample filters
2012-11-26 04:06:19 +01:00
ffmpeg_opt.c
ffmpeg: use avformat_seek_file() instead of av_seek_frame().
2012-12-02 00:06:02 +01:00
ffmpeg.c
ffmpeg: small indent fix.
2012-12-04 16:40:11 +01:00
ffmpeg.h
ffmpeg: fix swr filter_type for auto inserted aresample filters
2012-11-26 04:06:19 +01:00
ffplay.c
Merge remote-tracking branch 'qatar/master'
2012-11-29 14:22:58 +01:00
ffprobe.c
ffprobe: free dictionary in opt_show_entries()
2012-11-23 18:49:26 +01:00
ffserver.c
ffserver remove CONFIG_NOCUTILS check
2012-11-27 14:41:41 +01:00
INSTALL
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
library.mak
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
2012-11-23 13:30:51 +01:00
LICENSE
lavfi: add geq filter.
2012-11-11 23:12:54 +01:00
MAINTAINERS
MAINTAINERS: fix entry for img2
2012-11-06 01:46:21 +01:00
Makefile
Merge commit '4a606c830ae664013cea33800094d4d0f4ec62da'
2012-11-23 13:30:51 +01:00
README
README: be a tiny bit more verbose
2012-04-06 10:23:26 +02:00
RELEASE
Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa'
2012-10-24 14:01:36 +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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%