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
45,761 Commits 0 Branches 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
6912e7a008
Go to file
Michael Niedermayer 6912e7a008 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  configure: Group math functions into a separate variable
  avutil/mem: K&R formatting cosmetics
  avutil/lzo: K&R formatting cosmetics

Conflicts:
	configure
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-20 13:18:59 +02:00
compat
doc examples/scaling_video: remove unnecessary intermediary variable in fill_yuv_frame() 2012-10-20 12:06:45 +02:00
libavcodec Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed' 2012-10-20 12:37:52 +02:00
libavdevice
libavfilter vf_mp: fix null ptr deref in case of ENOMEM 2012-10-19 19:59:38 +02:00
libavformat Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed' 2012-10-20 12:37:52 +02:00
libavresample
libavutil Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
libpostproc
libswresample swresample: include ff_log2_tab for shared builds 2012-10-20 01:58:04 +02:00
libswscale
presets
tests Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed' 2012-10-20 12:37:52 +02:00
tools
.gitignore Merge commit 'c9ef43215c7d68c2cdcdbe02287aa114f27a32ed' 2012-10-20 12:37:52 +02:00
arch.mak
Changelog Merge commit '0af1fe845a9d7112da0a58d33a4fc81fe7c47e95' 2012-10-19 13:47:47 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: add missing check for ftell() return 2012-10-18 00:10:59 +02:00
cmdutils.h
common.mak
configure Merge remote-tracking branch 'qatar/master' 2012-10-20 13:18:59 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile
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.