RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-11 06:58:18 +00:00
Code Issues Projects Releases Wiki Activity
FFmpeg git repo
40,783 Commits 37 Branches 401 Tags 286 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%
de2cfb744a
Go to file
Michael Niedermayer de2cfb744a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcmenc: set correct bitrate value
  avprobe: don't print format entry name when only one was requested

Conflicts:
	ffprobe.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-17 23:45:00 +02:00
doc lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
libavcodec Merge remote-tracking branch 'qatar/master' 2012-05-17 23:45:00 +02:00
libavdevice lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
libavfilter aresample: add code to flush the internal swr buffer. 2012-05-17 22:45:05 +02:00
libavformat Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2012-05-10 23:30:42 +02:00
libavutil Merge remote-tracking branch 'qatar/master' 2012-05-16 02:27:31 +02:00
libpostproc
libswresample swresample: set the default parameters to "none" 2012-05-17 16:46:15 +02:00
libswscale Add yuva422p pix_fmt. 2012-05-08 08:39:37 +02:00
mt-work
presets
tests Merge remote-tracking branch 'qatar/master' 2012-05-17 23:45:00 +02:00
tools lavfi: drop planar/packed negotiation support 2012-05-16 13:16:05 +02:00
.gitignore doc/examples: add programs to .gitignore. 2012-05-12 19:58:33 +02:00
arch.mak
Changelog Merge remote-tracking branch 'qatar/master' 2012-05-16 02:27:31 +02:00
cmdutils_common_opts.h
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
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
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
Doxyfile
ffmpeg.c ffmpeg: automatically insert volume filter when -vol is used. 2012-05-17 17:37:18 +02:00
ffplay.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
ffprobe.c Merge remote-tracking branch 'qatar/master' 2012-05-17 23:45:00 +02:00
ffserver.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
INSTALL
library.mak
LICENSE
MAINTAINERS
Makefile Merge remote-tracking branch 'qatar/master' 2012-05-16 22:32:05 +02:00
README
RELEASE
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.