1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-18 17:18:09 +00:00
FFmpeg git repo
Go to file
Michael Niedermayer 3b071a4390 Merge commit 'a030279a67ef883df8cf3707774656fa1be81078'
* commit 'a030279a67ef883df8cf3707774656fa1be81078':
  ljpeg: use the correct number of components in yuv

Conflicts:
	libavcodec/mjpegdec.c

See: b2e57eb5a3

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 11:25:46 +02:00
compat
doc doc/filters: add RGB geq example 2013-05-20 11:12:09 +02:00
libavcodec Merge commit 'a030279a67ef883df8cf3707774656fa1be81078' 2013-05-21 11:25:46 +02:00
libavdevice lavd/v4l2enc: check write return value. 2013-05-20 16:33:21 +02:00
libavfilter lavfi/geq: mark timeline support 2013-05-20 01:40:07 +02:00
libavformat avformat/matroskadec: fix integer overflow 2013-05-19 23:38:01 +02:00
libavresample
libavutil avutil/frame: continue to process bufs even if some are empty 2013-05-20 23:34:15 +02:00
libpostproc
libswresample
libswscale swscale/output: silence warning about undefined 'ASSERT_LEVEL' 2013-05-19 14:06:16 +00:00
presets
tests Merge remote-tracking branch 'qatar/master' 2013-05-19 11:06:39 +02:00
tools tools: add zmqshell.py. 2013-05-19 17:59:21 +02:00
.gitignore
arch.mak
Changelog lavd: add v4l2 outdev. 2013-05-20 01:11:33 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: show timeline support in -filters listing 2013-05-19 19:55:15 +02:00
cmdutils.h
common.mak
configure Merge commit '0b6899f154347cdd0aa66c5ec16ed9c65871766f' 2013-05-20 10:46:21 +02: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
ffserver.c ffserver: replace atoll() by strtoll() 2013-05-19 11:13:07 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile build: drop unused ALLMANPAGES variable 2013-05-19 19:26:21 +02:00
README
RELEASE
version.sh

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.