RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-06 06:44:29 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
56,610 Commits 37 Branches 400 Tags 265 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
ef7e8efc6b
Go to file
Michael Niedermayer ef7e8efc6b Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4' 
* commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4':
  lavf: Avoid setting avg_frame_rate if delta_dts is negative

Conflicts:
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-23 14:19:13 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc doc/filters: add [] labels for the graph of the opening paragraph example 2013-09-23 00:11:56 +02:00
libavcodec Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd' 2013-09-23 14:03:53 +02:00
libavdevice avdevice/v4l: remove duplicate include 2013-09-21 15:36:33 +02:00
libavfilter avfilter: add ladspa wrapper filter 2013-09-22 16:36:10 +00:00
libavformat Merge commit 'ce67f442be0f6c4a8794272873852e256b5b8ee4' 2013-09-23 14:19:13 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil Merge remote-tracking branch 'qatar/master' 2013-09-22 11:51:38 +02:00
libpostproc
libswresample swresample: replace 2 av_free() by av_freep() 2013-09-16 22:44:15 +02:00
libswscale swscale/swscale_unscaled: fix alpha values for rgb/bgr -> RGB32_1 / BGR32_1 2013-09-19 23:15:51 +02:00
presets
tests Merge commit 'f1eac2b8a0370b908cd691086d11f51342054730' 2013-09-23 13:09:53 +02:00
tools tools: Fix apparent merge failure 2013-09-21 14:40:31 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
arch.mak
Changelog avfilter: add ladspa wrapper filter 2013-09-22 16:36:10 +00:00
cmdutils_common_opts.h
cmdutils.c cmdutils: silence warning about incompatible pointer types 2013-08-30 12:41:36 +00:00
cmdutils.h Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb' 2013-07-08 04:34:11 +02:00
common.mak
configure avfilter: add ladspa wrapper filter 2013-09-22 16:36:10 +00:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c ffmpeg_filter: check that the input media type match the filter 2013-08-14 03:03:41 +02:00
ffmpeg_opt.c Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffmpeg.c ffmpeg: check for unsupported "queing of command on first filter supporting the specific commend" 2013-09-10 14:13:44 +02:00
ffmpeg.h Merge commit '488a0fa68973d48e264d54f1722f7afb18afbea7' 2013-08-06 12:41:04 +02:00
ffplay.c ffplay: make next_nb_channels[] static const 2013-08-24 19:53:11 +02:00
ffprobe.c ffprobe: fix uninitialized variable warning 2013-09-23 14:16:34 +02:00
ffserver.c ffserver: allow choosing the pixel format 2013-09-14 03:51:45 +02:00
INSTALL
library.mak
LICENSE avfilter: port pullup filter from libmpcodecs 2013-09-17 17:03:36 +00:00
MAINTAINERS lavf/libssh: add MAINTAINERS entry 2013-09-21 16:35:41 +02:00
Makefile
README
RELEASE Update for 2.0 2013-07-10 02:15:43 +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.