RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
40,687 Commits 36 Branches 392 Tags 310 MiB
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer 7e944159c6 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (25 commits)
  vcr1: Add vcr1_ prefixes to all static functions with generic names.
  vcr1: Fix return type of common_init to match the function pointer signature.
  vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
  motion-test: remove disabled code
  gxfenc: remove disabled half-implemented MJPEG tag
  x86: use more standard construct for setting ASM functions in FFT code
  fate: westwood-aud: disable decoding
  fate: caf: disable decoding
  fate: film-cvid: drop pcm audio and rename test
  fate: d-cinema-demux: drop unnecessary flags
  fate: split off dpcm-interplay from interplay-mve tests
  fate: rename funcom-iss to adpcm-ima-iss
  fate: rename cryo-apc to adpcm-ima-apc
  fate: rename adpcm-psx-str-v3 to adpcm-xa
  fate: split off adpcm-ms-mono test from dxa-feeble
  fate: split off adpcm-ima-ws test from vqa-cc
  fate: add adpcm-ima-smjpeg test
  fate: split off adpcm-ima-amv from amv test
  fate: separate bmv audio and video tests
  fate: separate delphine-cin audio and video tests
  ...

Conflicts:
	doc/platform.texi
	libavcodec/vcr1.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/ref/fate/ea-mad-pcm-planar
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/mtv
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/qtrle-2bit
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
	tests/ref/fate/vqa-cc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-05-14 20:17:24 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-05-14 20:17:24 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-05-14 20:17:24 +02:00
libavdevice Merge remote-tracking branch 'qatar/master' 2012-05-07 22:51:34 +02:00
libavfilter lavfi: document filter design subtleties. 2012-05-14 18:56:52 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-05-14 20:17:24 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
libavutil lavu/bprint: add av_bprint_reset(). 2012-05-14 19:11:39 +02:00
libpostproc libpostproc: fix out of array accesses detected by AddressSanitizer. 2012-02-29 04:25:13 +01:00
libswresample libswresample-simd: Add ff_pack_6ch_float_to_int32_a_avx and ff_pack_6ch_float_to_int32_a_sse4 2012-05-13 20:56:18 +02:00
libswscale Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
mt-work Update todo 2011-06-12 18:01:29 +02:00
presets presets: specify the codecs. 2012-05-04 18:40:36 +02:00
tests Merge remote-tracking branch 'qatar/master' 2012-05-14 20:17:24 +02:00
tools Merge remote-tracking branch 'hexene/stagefright' 2012-04-19 01:58:30 +02:00
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1 cosmetics: Delete empty lines at end of file. 2012-02-09 12:26:45 +01:00
COPYING.LGPLv3
…
CREDITS Revert "partially rename FFmpeg to Libav" 2011-03-17 17:26:45 +01:00
Changelog Add Avid Meridien (AVUI) decoder. 2012-05-08 08:41:26 +02:00
Doxyfile remove avconv from Doxyfile 2012-01-25 22:47:45 +01:00
INSTALL Merge remote branch 'qatar/master' 2011-04-08 02:50:13 +02:00
LICENSE Remove libpostproc. 2012-02-23 19:36:16 +01:00
MAINTAINERS JACOsub demuxer, decoder and muxer. 2012-05-03 19:37:14 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-04-25 23:17:41 +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
arch.mak build: Consistently handle conditional compilation for all optimization OBJS. 2012-04-12 09:00:49 +02:00
cmdutils.c Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
cmdutils_common_opts.h cmdutils: fix -fdebug without -v xy 2012-04-05 21:50:50 +02:00
common.mak Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
configure configure: check for pthread_cancel. 2012-05-14 19:32:43 +02:00
ffmpeg.c ffmpeg: revert 492cc1 2012-05-14 15:15:11 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
ffprobe.c ffprobe: replace fast_asprintf() with bprint utils. 2012-05-14 19:11:39 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
library.mak Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
version.sh version.sh: handle shallow clones and snapshots. 2011-07-22 10:43:59 +02:00

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.