max/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,112 Commits 40 Branches 429 Tags
bb40f8f5e22c0c4097a704fdd6e7a66b96f0318d
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer bb40f8f5e2 Merge commit '2c5e1d0933facc20c6926a788cce05d3e6cad149' into release/2.2 
* commit '2c5e1d0933facc20c6926a788cce05d3e6cad149':
  configure: Use the right pkgconf file for openjpeg

Conflicts:
	configure

No change as the incorrect code wasnt in ffmpegs configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-11 13:13:13 +01:00
compat
…
doc
Revert "Add libx265 encoder"
2014-03-07 08:32:55 -05:00
libavcodec
Merge commit '6d7ab09788bdafffb3f3fc4f7feb262eb8cdf0b1' into release/2.2
2014-03-11 12:16:27 +01:00
libavdevice
Add more Bayer colour spaces to the video4linux2 device wrapper.
2014-02-23 13:42:41 +01:00
libavfilter
Merge commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb' into release/2.2
2014-03-11 12:16:05 +01:00
libavformat
Merge commit 'b37b83214ae3a462df1e8d3cc765ddbd2bfc73aa' into release/2.2
2014-03-11 13:12:41 +01:00
libavresample
Merge remote-tracking branch 'qatar/master'
2014-02-22 21:12:02 +01:00
libavutil
Merge commit '45acc228a6d5f1e7d6c5ce6da63b293bd5eda57d' into release/2.2
2014-03-11 12:09:13 +01:00
libpostproc
…
libswresample
swr: check that the context for swr_convert() has been initialized
2014-02-24 08:23:42 +01:00
libswscale
libswscale: bayer to rgb24 & yv12 colorspace converters
2014-02-23 02:38:22 +01:00
presets
…
tests
Update default FATE URL for release/10
2014-03-07 08:32:55 -05:00
tools
Merge commit 'a6a2d8eb8f125a2edb512a7a47df33dbd70d6b35' into release/2.2
2014-03-03 22:42:25 +01:00
.gitignore
gitignore: Add all examples below doc/examples
2014-03-02 11:42:37 -05:00
arch.mak
…
Changelog
changelog: Cleanups and prepare for v10_beta2
2014-03-08 20:50:36 -05:00
cmdutils_common_opts.h
…
cmdutils_opencl.c
…
cmdutils.c
…
cmdutils.h
…
common.mak
…
configure
Merge commit '4b476e6aa4b830f919cf3c67ba2caa039ff285b9' into release/2.2
2014-03-11 10:32:26 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
ffmpeg_filter.c
…
ffmpeg_opt.c
ffmpeg_opt: get_preset_file_2(): fix avio_open2() return code check
2014-02-25 00:05:37 +01:00
ffmpeg_vdpau.c
…
ffmpeg.c
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
2014-02-24 21:08:19 +01:00
ffmpeg.h
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
2014-02-24 21:08:19 +01:00
ffplay.c
…
ffprobe.c
…
ffserver.c
…
INSTALL
…
library.mak
…
LICENSE
Revert "Add libx265 encoder"
2014-03-07 08:32:55 -05:00
MAINTAINERS
update for 2.2
2014-03-01 03:34:59 +01:00
Makefile
…
README
…
RELEASE
Prepare for 10_beta2 Release
2014-03-02 11:42:36 -05:00
VERSION
Update for 2.2-rc1
2014-03-01 04:03:08 +01: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
S
Description
No description provided
Readme 229 MiB
Languages
C 89%
Assembly 8.4%
Makefile 1.4%
GLSL 0.4%
C++ 0.3%
Other 0.3%