eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-07 22:55:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
61,555 Commits 38 Branches 415 Tags
020baa0be64b460d48fecdfe13f1adabf6a293cd
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 020baa0be6 Merge commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347' 
* commit '1c1fbc70cae44c10af8ff865826e31c17bc9f347':
  mjpeg: set color_range

Conflicts:
	libavcodec/mjpegdec.c

See: 2f870e262e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 16:12:25 +01:00
compat
Merge remote-tracking branch 'qatar/master'
2014-03-10 12:05:02 +01:00
doc
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
2014-03-17 14:41:13 +01:00
libavcodec
Merge commit '6612a03d7470af4aa6b8aa313b1eff013691d181'
2014-03-17 15:58:02 +01:00
libavdevice
Merge remote-tracking branch 'cigaes/master'
2014-03-08 15:00:36 +01:00
libavfilter
avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)
2014-03-16 17:25:54 +01:00
libavformat
Merge commit '58c215961a9067bb670387bbd72286c30de04b93'
2014-03-17 15:43:55 +01:00
libavresample
Merge remote-tracking branch 'qatar/master'
2014-02-22 21:12:02 +01:00
libavutil
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
2014-03-17 14:41: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
Merge commit '1481d24c3a0abf81e1d7a514547bd5305232be30'
2014-03-17 14:41:13 +01:00
presets
…
tests
avformat/movenc: only ommit encoder tag of the metadata for bitexact mode
2014-03-16 16:26:35 +01:00
tools
tools/build_libstagefright: switch git urls to https
2014-03-12 23:07:00 +01:00
.gitignore
Merge commit 'e7dfaf16a403972eb6aed5ce8f84c0085bd2fb5a'
2014-02-25 20:26:00 +01:00
arch.mak
Merge commit 'b4dd424d96f09f9bafb88e47f37df65dc4529143'
2014-03-13 22:35:47 +01:00
Changelog
Changelog: move post 2.2 branching entries out of the 2.2 changelog
2014-03-16 19:15:58 +01:00
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 'be039278b5ebd8075d90a3508db2aed5adf59e02'
2014-03-17 13:23:48 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
ffmpeg_filter.c
…
ffmpeg_opt.c
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams
2014-03-16 15:15:02 +01:00
ffmpeg_vdpau.c
…
ffmpeg.c
ffmpeg: fix printing INT64_MIN pts at the end
2014-03-16 06:26:40 +01:00
ffmpeg.h
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
2014-02-24 21:08:19 +01:00
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
update for 2.2
2014-03-01 03:34:59 +01:00
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 305 MiB
Languages
C 89.8%
Assembly 8.1%
Makefile 1.3%
C++ 0.3%
Objective-C 0.2%
Other 0.1%