RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-01 04:13:57 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
33,715 Commits 37 Branches 400 Tags 263 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
266172aaf9
Go to file
Michael Niedermayer 266172aaf9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  w32threads: support for frame multithreading
  avcodec: remove stray @deprecated comment

Conflicts:
	libavcodec/utils.c
	libavcodec/w32thread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-17 02:29:40 +02:00
doc Allow to overwrite input stream tags. 2011-10-16 19:05:11 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2011-10-17 02:29:40 +02:00
libavdevice lavd/lavfi: compute and use the used samples buffer size for the output audio packet size 2011-10-16 21:18:44 +02:00
libavfilter af_ashowinfo: fix plane size computation for planar layout formats 2011-10-16 01:58:31 +02:00
libavformat av_tempfile: Pass int log_offset, void *log_ctx 2011-10-16 21:51:28 +02:00
libavutil av_tempfile: dont try the current directory with mkstemp() unless we are on windows 2011-10-16 22:32:41 +02:00
libpostproc
libswresample Do not warn about wrong channel layout if no channel layout is defined. 2011-10-16 17:12:53 +02:00
libswscale Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
mt-work
tests Merge remote-tracking branch 'qatar/master' 2011-10-16 04:02:09 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2011-10-13 18:04:02 +02:00
.gitignore
avconv.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
Changelog Merge remote-tracking branch 'qatar/master' 2011-10-11 03:42:43 +02:00
cmdutils_common_opts.h cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.c cmdutils: Fix loglevel for -debug 2011-10-14 02:18:55 +02:00
cmdutils.h cmdutils.h: Project name cleanup 2011-10-14 02:18:55 +02:00
common.mak
configure Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c Allow to overwrite input stream tags. 2011-10-16 19:05:11 +02:00
ffplay.c ffplay: avoid window resize crash on osx with libsdl 1.2.14 2011-10-16 19:28:22 +02:00
ffprobe.c ffprobe: add AVClass to writers 2011-10-15 00:54:22 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
INSTALL
LICENSE
MAINTAINERS
Makefile
README
RELEASE
subdir.mak
version.sh

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.