RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
42,012 Commits 37 Branches 400 Tags 255 MiB
C 90.2%
Assembly 7.9%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
Go to file
Michael Niedermayer 4453f6b861 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  flv: add support for G.711
  doc: git: Add checklist with test steps to perform before pushing
  flvenc: K&R formatting cosmetics
  movenc: Add channel layouts for PCM.

Conflicts:
	libavformat/flvenc.c
	tests/ref/fate/acodec-pcm-s16be
	tests/ref/fate/acodec-pcm-s24be
	tests/ref/fate/acodec-pcm-s32be
	tests/ref/fate/acodec-pcm-s8

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2012-06-28 23:57:31 +02:00
doc Merge remote-tracking branch 'qatar/master' 2012-06-28 23:57:31 +02:00
libavcodec Generate channel layout, reordering for DTS-XXCH extension and, undo embedded downmixes 2012-06-28 22:26:15 +02:00
libavdevice lavfi: remove old video sink API 2012-06-26 11:40:08 +02:00
libavfilter lavfi: deprecate av_buffersrc_buffer() function 2012-06-28 22:27:05 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-06-28 23:57:31 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-06-27 01:58:09 +02:00
libavutil parseutils: fix sorting of colors 2012-06-28 17:15:08 +00:00
libpostproc postprocess: fix another void returning void function. 2012-06-10 18:26:16 +02:00
libswresample swr: fix compilation with ancient toolchain that doesnt support SSSE3 2012-06-28 11:13:19 +02:00
libswscale swscale: use designated initializers for AVClass 2012-06-22 02:34:34 +00:00
mt-work
…
presets
…
tests Merge remote-tracking branch 'qatar/master' 2012-06-28 23:57:31 +02:00
tools tools/graph2dot: make dot graph representation a bit more compact 2012-06-26 11:34:38 +02:00
.gitignore Merge remote-tracking branch 'qatar/master' 2012-06-13 22:43:57 +02:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
Changelog Merge remote-tracking branch 'qatar/master' 2012-06-24 02:09:53 +02:00
Doxyfile
…
INSTALL
…
LICENSE
…
MAINTAINERS MAINTAINERS: reorganize entries in the libavfilter section 2012-06-17 22:17:44 +02:00
Makefile Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
README
…
RELEASE
…
arch.mak Optimization of AMR NB and WB decoders for MIPS 2012-06-11 21:12:39 +02:00
cmdutils.c codec_release_buffer: fix handling of non user buffers 2012-06-22 23:53:24 +02:00
cmdutils.h Merge remote-tracking branch 'qatar/master' 2012-06-06 01:08:33 +02:00
cmdutils_common_opts.h
…
common.mak
…
configure Merge remote-tracking branch 'qatar/master' 2012-06-28 01:08:52 +02:00
ffmpeg.c ffmpeg: warn that -t does not work with -filter_complex. 2012-06-28 21:40:50 +02:00
ffplay.c ffplay: simplify code by using avfilter_unref_bufferp() 2012-06-28 22:27:05 +02:00
ffprobe.c ffprobe: dump AVPacket.convergence_duration. 2012-06-18 09:39:17 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
library.mak
…
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.