virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity
Mirror of https://git.ffmpeg.org/ffmpeg.git
40,018 Commits 37 Branches 400 Tags 465 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
3194ab78a6
Go to file
Michael Niedermayer 3194ab78a6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec: add a cook parser to get subpacket duration
  FATE: allow lavf tests to alter input parameters
  FATE: replace the acodec-pcm_s24daud test with an enc_dec_pcm checksum test
  FATE: replace the acodec-g726 test with 4 new encode/decode tests
  FATE: replace current g722 encoding tests with an encode/decode test
  FATE: add a pattern rule for generating asynth wav files
  FATE: optionally write a WAVE header in audiogen
  avutil: add audio fifo buffer

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavutil/avutil.h
	tests/Makefile
	tests/codec-regression.sh
	tests/fate/voice.mak
	tests/lavf-regression.sh
	tests/ref/acodec/g722
	tests/ref/acodec/g726
	tests/ref/acodec/pcm_s24daud
	tests/ref/lavf/dv_fmt
	tests/ref/lavf/gxf
	tests/ref/lavf/mxf
	tests/ref/lavf/mxf_d10
	tests/ref/seek/lavf_dv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-20 22:18:26 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
ffpresets
libavcodec Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-04-04 21:17:52 +02:00
libavfilter lavfi/mp: remove libmpcodecs mirror filter 2012-04-20 01:01:24 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample swr: add a swr_flags AVOption 2012-04-11 14:10:22 +02:00
libswscale sws: remove cliping in yuv2rgb code. 2012-04-15 23:38:42 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-03-25 23:10:30 +02:00
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
Changelog lavfi: port 2xsai filter from libmpcodecs 2012-04-13 00:14:06 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
cmdutils.c avconv: get output pixel format from lavfi. 2012-04-15 20:22:36 +02:00
cmdutils.h Merge commit '3b266da3d35f3f7a61258b78384dfe920d875d29' 2012-04-17 04:03:50 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
configure Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: check encoder earlier. 2012-04-20 16:30:58 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-04-18 00:28:06 +02:00
ffprobe.c ffprobe: use avbprint API 2012-04-08 00:02:21 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
INSTALL
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
LICENSE
MAINTAINERS ZeroCodec Decoder 2012-03-19 00:19:13 +01:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
README README: be a tiny bit more verbose 2012-04-06 10:23:26 +02:00
RELEASE RELEASE: bump to current version (0.10.2). 2012-03-26 22:47:28 +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.