RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-18 05:24:42 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
58,692 Commits 37 Branches 400 Tags 241 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
ab00800cde
Go to file
Michael Niedermayer ab00800cde Revert "yadif: add parens around macro parameters" 
This reverts commit 49e617f956.
This reduces the amount of non LGPL code, making a relicensing to LGPL
easier

Conflicts:

	libavfilter/vf_yadif.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-01 20:26:26 +01:00
compat Merge remote-tracking branch 'qatar/master' 2013-11-24 23:27:32 +01:00
doc doc/ffserver: fix misc minor typos 2013-12-01 20:24:49 +01:00
libavcodec vp9: make decode_coeffs() return value void. 2013-11-30 16:26:14 -05:00
libavdevice lavd/pulse_audio_enc: add buffer size control options 2013-11-27 10:12:54 +01:00
libavfilter Revert "yadif: add parens around macro parameters" 2013-12-01 20:26:26 +01:00
libavformat avisynth: make avs_library statically allocated. 2013-12-01 13:14:47 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
libavutil build: rename version.h to libavutil/ffversion.h 2013-11-30 21:42:55 +01:00
libpostproc
libswresample lswr: fix assert failure on unknown layouts. 2013-11-03 10:30:37 +01:00
libswscale Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949' 2013-11-23 12:10:40 +01:00
presets
tests vp9: add a new segmentation sample. 2013-11-30 16:26:14 -05:00
tools tools/probetest: also print the time the probe functions needed 2013-11-08 22:33:52 +01:00
.gitignore build: rename version.h to libavutil/ffversion.h 2013-11-30 21:42:55 +01:00
arch.mak
Changelog Merge remote-tracking branch 'qatar/master' 2013-11-26 13:13:45 +01:00
cmdutils_common_opts.h cmdutils: Add -buildconf option. 2013-11-19 22:09:48 +01:00
cmdutils.c build: rename version.h to libavutil/ffversion.h 2013-11-30 21:42:55 +01:00
cmdutils.h cmdutils: remove this_year constant, use CONFIG_THIS_YEAR instead 2013-11-26 10:03:32 +01:00
common.mak Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23' 2013-11-15 12:19:45 +01:00
configure Merge commit 'f058f384a0d76bfd125f4738dceab7c890186432' 2013-11-30 20:40:59 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c Merge remote-tracking branch 'qatar/master' 2013-11-24 05:21:19 +01:00
ffmpeg_opt.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg_vdpau.c Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffmpeg.c ffmpeg: ensure that -fix_sub_duration doesnt create subtitles with zero duration 2013-11-28 21:30:03 +01:00
ffmpeg.h Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea' 2013-11-23 14:46:48 +01:00
ffplay.c ffplay: do not call avcodec_register_all() explicitly 2013-11-25 00:03:20 +01:00
ffprobe.c build: rename version.h to libavutil/ffversion.h 2013-11-30 21:42:55 +01:00
ffserver.c ffserver: print error code description in case of write_header() failure 2013-11-30 14:35:33 +01:00
INSTALL
library.mak library.mak: only run asm strip if ASMSTRIP flags are set 2013-11-28 21:52:46 +01: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 Makefile: remove version.h on distclean 2013-11-30 21:52:39 +01:00
README
RELEASE RELEASE: update to 2.1.git 2013-11-29 16:41:42 +01:00
version.sh version.sh: add preprocessing guards 2013-11-30 21:42:03 +01: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.