RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
45,450 Commits 36 Branches 398 Tags 244 MiB
C 90.2%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer 18884f159b Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723' 
* commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723':
  rtpdec_xiph: fix function return type
  smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
  mpegvideo: remove write-only variable
  Use proper return values in case of missing features
  fate: add avstring test
  rangecoder-test: Set error message log level to error, instead of debug

Conflicts:
	libavcodec/aacdec.c
	libavcodec/amrnbdec.c
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-10-13 15:42:49 +02:00
compat MinGW: Use our snprintf/vsnprintf when MinGW's is broken 2012-09-25 18:14:14 -04:00
doc Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
libavcodec Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723' 2012-10-13 15:42:49 +02:00
libavdevice caca: fix 10l typo 2012-10-12 19:05:58 +02:00
libavfilter Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507' 2012-10-13 14:14:11 +02:00
libavformat Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723' 2012-10-13 15:42:49 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
libavutil Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf' 2012-10-13 14:35:42 +02:00
libpostproc postproc: Create version.h header 2012-09-28 15:06:26 +02:00
libswresample swri_resample_init: unsupported sample formats are an internal error. 2012-10-11 04:36:23 +02:00
libswscale sws: do not use av_pix_fmt_descriptors directly 2012-10-12 16:57:04 +00:00
presets
…
tests Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723' 2012-10-13 15:42:49 +02:00
tools Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
.gitignore gitignore: codec_names.h is no more 2012-09-07 14:59:01 +02:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Changelog prepare 9_beta1 release 2012-10-11 18:36:40 +02:00
Doxyfile
…
INSTALL
…
LICENSE
…
MAINTAINERS add dshow maintainer 2012-10-12 19:52:05 +02:00
Makefile Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
README
…
RELEASE prepare 9_beta1 release 2012-10-11 18:36:40 +02:00
arch.mak Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
cmdutils.c Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df' 2012-10-12 15:34:49 +02:00
cmdutils.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
cmdutils_common_opts.h
…
common.mak Merge remote-tracking branch 'qatar/master' 2012-09-16 14:55:00 +02:00
configure Merge commit 'ca411fc1d34329cd17b28627f697e391ae52073f' 2012-10-13 15:25:11 +02:00
ffmpeg.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffmpeg.h Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffmpeg_filter.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffmpeg_opt.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffplay.c Merge commit 'bc4620e5d61a4dd9a1f654fadd281a172aab04be' 2012-10-13 15:01:39 +02:00
ffprobe.c ffprobe: fix use of uninitialized pointer in av_strtok() 2012-10-11 03:37:43 +02:00
ffserver.c ffserver: fix return value of add_codec() 2012-10-13 05:36:41 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-10-11 15:55:41 +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.