RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-15 11:44:49 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
45,369 Commits 37 Branches 400 Tags 239 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
f391e405df
Go to file
Michael Niedermayer f391e405df Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 
* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
  Use the new aes/md5/sha/tree allocation functions
  avutil: Add functions for allocating opaque contexts for algorithms
  svq3: fix pointer type warning
  svq3: replace unsafe pointer casting with intreadwrite macros
  parseutils-test: various cleanups

Conflicts:
	doc/APIchanges
	libavcodec/svq3.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-12 14:52:34 +02:00
compat
doc Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
libavcodec Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
libavdevice Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
libavfilter lavfi/ebur128: fix typo in condition. 2012-10-11 18:41:07 +02:00
libavformat Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
libavresample
libavutil Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21' 2012-10-12 14:52:34 +02:00
libpostproc
libswresample swri_resample_init: unsupported sample formats are an internal error. 2012-10-11 04:36:23 +02:00
libswscale yuv2rgb: fix declared array sizes, so they match actuals. 2012-10-11 18:20:24 +02:00
presets
tests Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
tools qt-faststart: fix printf argument type 2012-10-10 18:50:56 +02:00
.gitignore
arch.mak
Changelog prepare 9_beta1 release 2012-10-11 18:36:40 +02:00
cmdutils_common_opts.h
cmdutils.c Merge commit 'b94e4acb4874843e914fd3cb8e089aff0756bb4a' 2012-10-10 13:18:05 +02:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
common.mak
configure Merge commit '0a75d1da23b8659ec49391469bb592da12760077' 2012-10-12 14:15:33 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg_filter.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffmpeg_opt.c Merge commit '4436f25a1682ada3f7226cb6fadf429946933161' 2012-10-11 15:46:48 +02:00
ffmpeg.c Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffmpeg.h Merge commit 'fb722a900fc5cc9e003b9fef25b27ed7fc5547a2' 2012-10-10 13:51:07 +02:00
ffplay.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ffprobe.c ffprobe: fix use of uninitialized pointer in av_strtok() 2012-10-11 03:37:43 +02:00
ffserver.c
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +02:00
LICENSE
MAINTAINERS
Makefile
README
RELEASE prepare 9_beta1 release 2012-10-11 18:36:40 +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.