RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 17:32:06 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
29,700 Commits 1 Branch 400 Tags 244 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
6d6b0c96fd
Go to file
Michael Niedermayer 6d6b0c96fd Merge remote branch 'qatar/master' 
* qatar/master:
  drawtext: add documentation for the shadow parameters
  drawtext: add shadow support.
  drawtext: factor draw_glyphs.
  drawtext: fix and optimize yuv blend.
  drawtext: get rid of divisions in the inner loop.
  drawtext: simplify chroma blend and fix chroma alpha.
  lavfi: Port drawtext filter by Hemanth from the libavfilter soc repo

Conflicts:
	configure
	libavfilter/avfilter.h
	libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-08 03:29:51 +02:00
doc lavfi: add libavfilter/avcodec.h and avfilter_copy_frame_props() 2011-05-07 12:03:49 +02:00
ffpresets Remove now useless ffpresets for x264, use -preset 2011-04-16 16:59:39 -07:00
libavcodec svq1dec: simpify mean calculation. 2011-05-08 01:33:40 +02:00
libavdevice Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
libavfilter Merge remote branch 'qatar/master' 2011-05-08 03:29:51 +02:00
libavformat Remove unused variable. 2011-05-07 20:14:48 +02:00
libavutil Only add 1 byte to av_malloc(0) when it actually returned NULL 2011-05-07 16:21:54 +02:00
libpostproc Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
libswscale Fix function pointer type to match function it is assigned. 2011-05-07 20:14:48 +02:00
mt-work Merge remote-tracking branch 'ffmpeg-mt/master' 2011-03-30 02:58:38 +02:00
tests lavfi-regression: provide filter arguments to showfiltfmts 2011-05-05 18:38:48 +02:00
tools Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
.gitignore
Changelog DPX image encoder 2011-05-01 19:35:55 +02:00
cmdutils_common_opts.h
cmdutils.c lavfi: rename AVFilterBufferRefVideoProps.pixel_aspect to sample_aspect_ratio 2011-05-01 13:10:18 +02:00
cmdutils.h Merge remote branch 'qatar/master' 2011-05-04 04:06:26 +02:00
common.mak Merge remote-tracking branch 'newdev/master' 2011-04-01 02:58:15 +02:00
configure Merge remote branch 'qatar/master' 2011-05-08 03:29:51 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Doxyfile Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00
ffmpeg.c vsrc_buffer: simplify av_vsrc_buffer_add_frame*() interface 2011-05-07 12:03:59 +02:00
ffplay.c ffplay: fix null pointer read when codec unavilable. 2011-05-07 20:03:04 +02:00
ffprobe.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
ffserver.c Merge remote branch 'qatar/master' 2011-04-27 03:51:04 +02:00
ffserver.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
MAINTAINERS add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
Makefile Makefile:Put lost tab back. 2011-05-06 02:21:52 +02:00
README Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
subdir.mak Revert "Remove support for stripping executables" 2011-04-01 00:24:12 +02:00
version.sh Merge remote-tracking branch 'newdev/master' 2011-03-19 20:05:11 +01:00

README 

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.