RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-29 10:52:20 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
50,269 Commits 37 Branches 400 Tags 246 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
6db37c9468
Go to file
Michael Niedermayer 6db37c9468 Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044' 
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
  avconv: pass libavresample options to AVFilterGraph

Conflicts:
	cmdutils.c
	cmdutils.h
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 17:41:31 +01:00
compat
doc Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf' 2013-02-24 17:10:55 +01:00
libavcodec Merge commit 'd7c450436fcb9d3ecf59884a574e7684183e753d' 2013-02-24 16:53:09 +01:00
libavdevice v4l2: try to fix build on BSD 2013-02-18 00:53:17 +01:00
libavfilter Merge commit '9f1223562e134bac6345a465870b9d56ff7d60cf' 2013-02-24 17:10:55 +01:00
libavformat Merge commit '56daf10e0313c5e36f43e773f457d2a99ff0df10' 2013-02-24 13:15:59 +01:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-02-13 12:58:29 +01:00
libavutil Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855' 2013-02-24 12:22:51 +01:00
libpostproc Fix libpostproc compilation on x86_32 with disable-optimizations. 2013-02-09 15:03:04 +01:00
libswresample swr: check channel layouts before using them. 2013-02-13 17:50:24 +01:00
libswscale sws/x86: improve rounding for yuv2yuvX 2013-02-15 23:33:04 +01:00
presets
tests fate/subtitles: add character encoding conversion test. 2013-02-23 00:24:02 +01:00
tools tools: add seek_print. 2013-02-24 13:12:46 +01:00
.gitignore tools: add seek_print. 2013-02-24 13:12:46 +01:00
arch.mak
Changelog blend filter 2013-02-21 20:16:23 +00:00
cmdutils_common_opts.h
cmdutils.c Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044' 2013-02-24 17:41:31 +01:00
cmdutils.h Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044' 2013-02-24 17:41:31 +01:00
common.mak Merge commit '4cc4b33f71d3982df404fceb4405d656c538bc74' 2013-02-24 15:24:38 +01:00
configure configure: hwaccel autodetection has been removed in 82ca17ac7a 2013-02-24 16:40:46 +01: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 Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044' 2013-02-24 17:41:31 +01:00
ffmpeg_opt.c Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044' 2013-02-24 17:41:31 +01:00
ffmpeg.c Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044' 2013-02-24 17:41:31 +01:00
ffmpeg.h Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044' 2013-02-24 17:41:31 +01:00
ffplay.c ffplay: only display frames if there are no pending events 2013-02-15 13:12:10 +01:00
ffprobe.c
ffserver.c
INSTALL
library.mak build: fixes a "can't cd to..." issue when installing shared libraries. 2013-02-15 08:39:35 +01:00
LICENSE lavfi: port MP noise filter 2013-02-16 11:42:41 +00:00
MAINTAINERS MAINTAINERS: add 1.1, remove 0.10 2013-01-06 21:42:35 +01:00
Makefile build: Add proper infrastructure for adding and checking host CPPFLAGS 2013-02-23 20:23:45 +01:00
README
RELEASE
version.sh

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.