eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-02-27 09:04:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,467 Commits 38 Branches 415 Tags
a8a84fa8b2cdeea11bb6bc0efbd81d5520a02b5e
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer a8a84fa8b2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  codec_desc: group image codecs together

Conflicts:
	libavcodec/codec_desc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-14 19:36:46 +01:00
compat
Merge remote-tracking branch 'qatar/master'
2014-03-10 12:05:02 +01:00
doc
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
2014-03-13 22:35:47 +01:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2014-03-14 19:36:46 +01:00
libavdevice
…
libavfilter
…
libavformat
Merge remote-tracking branch 'qatar/master'
2014-03-14 12:00:45 +01:00
libavresample
…
libavutil
Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'
2014-03-14 01:56:25 +01:00
libpostproc
…
libswresample
…
libswscale
Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'
2014-03-14 01:56:25 +01:00
presets
…
tests
Add fieldmatch test
2014-03-10 02:59:01 +01:00
tools
tools/build_libstagefright: switch git urls to https
2014-03-12 23:07:00 +01:00
.gitignore
…
arch.mak
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
2014-03-13 22:35:47 +01:00
Changelog
…
cmdutils_common_opts.h
…
cmdutils_opencl.c
…
cmdutils.c
avconv: Match stream id
2014-03-13 11:59:34 +01:00
cmdutils.h
…
common.mak
…
configure
Merge commit '7a650caf6436ddfe417bdcb5ce520c96c779af7b'
2014-03-14 19:08:14 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
ffmpeg_filter.c
…
ffmpeg_opt.c
…
ffmpeg_vdpau.c
…
ffmpeg.c
…
ffmpeg.h
…
ffplay.c
ffplay: display information on stream cycling
2014-03-12 00:32:38 +01:00
ffprobe.c
…
ffserver.c
…
INSTALL
…
library.mak
…
LICENSE
…
MAINTAINERS
…
Makefile
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
2014-03-13 22:35:47 +01:00
README
…
RELEASE
Prepare for 11_alpha1 Release
2014-03-13 08:24:11 -04: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.
Reference in New Issue View Git Blame Copy Permalink
Description
No description provided
Readme 335 MiB
Languages
C 89.6%
Assembly 8.1%
Makefile 1.3%
C++ 0.3%
GLSL 0.2%
Other 0.3%