RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 09:12:33 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
46,236 Commits 37 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
84833b028b
Go to file
Michael Niedermayer 84833b028b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacdec: Drop some unused function arguments
  x86: Fix assembly with NASM
  x86: fmtconvert: Refactor cvtps2pi emulation through cpuflags

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-31 14:27:11 +01:00
compat Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff' 2012-10-24 13:42:58 +02:00
doc Merge commit '652f5185945c8405fc57aed353286858df8d066f' 2012-10-31 14:02:35 +01:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-10-31 14:27:11 +01:00
libavdevice x11grab: fix mixed declaration and code 2012-10-29 22:24:10 +01:00
libavfilter Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
libavformat wavenc: fix curruption of metadata 2012-10-30 21:48:39 +01:00
libavresample Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
libavutil Merge commit 'be923ed659016350592acb9b3346f706f8170ac5' 2012-10-31 14:16:18 +01:00
libpostproc pp: avoid overflow in w*h 2012-10-13 21:17:43 +02:00
libswresample Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73' 2012-10-31 13:43:33 +01:00
libswscale Merge commit 'be923ed659016350592acb9b3346f706f8170ac5' 2012-10-31 14:16:18 +01:00
presets
tests lavfi: add field filter 2012-10-31 12:07:11 +01:00
tools probetest: fix possible use of uninitialized data 2012-10-31 13:16:52 +01:00
.gitignore tools: add ffescape utility 2012-10-25 23:56:16 +02:00
arch.mak
Changelog lavfi: add field filter 2012-10-31 12:07:11 +01:00
cmdutils_common_opts.h
cmdutils.c Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
cmdutils.h
common.mak Merge commit '04581c8c77ce779e4e70684ac45302972766be0f' 2012-10-31 13:57:09 +01:00
configure configure: fix print_config() with broke awks 2012-10-30 19:26:07 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg: fix negative array index 2012-10-22 13:58:19 +02:00
ffmpeg_opt.c ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffmpeg.c Merge commit '381dc1a5ec0925b281c573457c413ae643567086' 2012-10-30 13:52:03 +01:00
ffmpeg.h ffmpeg: use av_rescale_delta() on the audio filter input 2012-10-27 00:26:35 +02:00
ffplay.c ffplay: if there is no audio stream, use external clock by default 2012-10-21 17:18:12 +02:00
ffprobe.c ffprobe: add an array of section print buffers to the WriterContext 2012-10-24 23:40:21 +02:00
ffserver.c Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26' 2012-10-28 13:19:11 +01:00
INSTALL
library.mak Merge commit '80521c1997a23e148edf89e11b939ab8646297ca' 2012-10-24 12:53:26 +02:00
LICENSE
MAINTAINERS Change my GPG fingerprint 2012-10-30 18:51:21 +01:00
Makefile x86: yasm: Use complete source path for macro helper %includes 2012-10-31 00:37:42 +01:00
README
RELEASE Merge commit 'ceb754d041f5f6327fd9195a5f43575af9516daa' 2012-10-24 14:01:36 +02:00
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.