virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
62,553 Commits 37 Branches 400 Tags 458 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
74a8dbe1c4
Go to file
Michael Niedermayer 74a8dbe1c4 Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 
* commit '58400ac133bcfb6bf8196b4e5208bc178307739b':
  lavfi: name anonymous structs

Conflicts:
	libavfilter/buffersink.c
	libavfilter/f_select.c
	libavfilter/src_movie.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_overlay.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_unsharp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-19 18:20:17 +02:00
compat
doc Magic Lantern Video (MLV) demuxer 2014-04-19 05:06:00 +02:00
libavcodec vp9/x86: simplify FILTER_INIT. 2014-04-19 17:30:33 +02:00
libavdevice Merge remote-tracking branch 'lukaszmluki/master' 2014-04-18 04:57:23 +02:00
libavfilter Merge commit '58400ac133bcfb6bf8196b4e5208bc178307739b' 2014-04-19 18:20:17 +02:00
libavformat Magic Lantern Video (MLV) demuxer 2014-04-19 05:06:00 +02:00
libavresample Merge commit '21d8f4da91673051ad7055cf63d989488a56368e' 2014-04-17 21:07:25 +02:00
libavutil x86/float_dsp: remove duplicated code from vector_dmul_scalar 2014-04-19 14:21:51 +02:00
libpostproc
libswresample swresample/resample_template: try to consider src_size more exactly 2014-04-15 06:35:35 +02:00
libswscale Fix compilation with !HAVE_6REGS. 2014-04-19 09:56:01 +02:00
presets
tests avformat/mlv: add fate sample 2014-04-19 05:06:06 +02:00
tools
.gitignore
arch.mak
Changelog Magic Lantern Video (MLV) demuxer 2014-04-19 05:06:00 +02:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '4936ef6492f640e1606c6507f2c4e495164d3974' 2014-04-19 13:39:32 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: fix mixed merged & split side data with the stream->packet hack 2014-04-18 01:01:38 +02:00
ffmpeg.h
ffplay.c avformat: add av_format_inject_global_side_data(), and disable it by default 2014-04-15 02:37:40 +02:00
ffprobe.c ffprobe: do not lose non ascii characters in non utf8 strings 2014-04-13 15:21:20 +02:00
ffserver.c
INSTALL
library.mak
LICENSE
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.