RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-10 09:09:50 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
56,015 Commits 37 Branches 400 Tags 253 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
233ab0f02a
Go to file
Michael Niedermayer 233ab0f02a Merge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab' 
* commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab':
  matroskadec: Check that .lang was allocated and set before reading it

Conflicts:
	libavformat/matroskadec.c

See: 01fd1aa0ad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-04 12:07:06 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc lavfi/drawtext: add generic timeline interface and deprecate "draw". 2013-09-03 21:12:15 +02:00
libavcodec Merge commit 'f7c5883126f9440547933eefcf000aa78af4821c' 2013-09-04 11:58:00 +02:00
libavdevice Read h264 headers from v4l2 to allow stream-copying. 2013-09-01 21:27:43 +02:00
libavfilter lavfi/mptestsrc: use outlink->frame_count 2013-09-03 20:15:46 +00:00
libavformat Merge commit '5bcd3ae5b167fb74215520b01d5d810e0c8986ab' 2013-09-04 12:07:06 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil avutil/fifo: assert that theres enough data in the fifo on drain calls. 2013-09-03 03:11:35 +02:00
libpostproc
libswresample
libswscale Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
presets
tests fate: Force diff into text mode 2013-09-04 01:02:06 +02:00
tools Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
.gitignore
arch.mak
Changelog lavfi: port phase filter from libmpcodecs 2013-09-03 14:05:38 +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
common.mak
configure lavfi/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +00:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: show probe_score in the format section 2013-09-01 11:34:18 +02:00
ffserver.c
INSTALL
library.mak
LICENSE lavfi/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +00:00
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.