dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-07-16 04:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,060 Commits 40 Branches 429 Tags
0f242e62b4b4f4da08b4e8e49aa1e4c2900a51f6
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Michael Niedermayer 0f242e62b4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: Merge pthreads/w32threads OBJS declarations

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-13 21:33:13 +01:00
compat
Merge remote-tracking branch 'qatar/master'
2013-11-24 23:27:32 +01:00
doc
examples/demuxing_decoding: print the decoding error when it happens.
2013-12-13 10:37:20 +01:00
libavcodec
Merge remote-tracking branch 'qatar/master'
2013-12-13 21:33:13 +01:00
libavdevice
Merge commit 'd64341e498fa46c6cf4c23d408177d7489559654'
2013-12-09 20:52:14 +01:00
libavfilter
avfilter/vf_pullup: fix memleak on error
2013-12-13 15:14:03 +01:00
libavformat
avformat/ipmovie: Fix use of uninitialized memory in OPCODE_INIT_VIDEO_BUFFERS
2013-12-13 19:51:47 +01:00
libavresample
avresample: Include libavutil/avutil.h in version.h
2013-12-06 22:13:20 +01:00
libavutil
Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5'
2013-12-12 19:12:33 +01:00
libpostproc
postproc: fix null pointer dereference with invalid option strings
2013-12-11 22:28:42 +01:00
libswresample
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
libswscale
swscale/utils: fill xyz tables only when they will be used
2013-12-07 02:04:31 +01:00
presets
…
tests
lavf/mux: Don't write "encoder" metadata tag when bitexact is requested
2013-12-06 19:33:41 +01:00
tools
tools/probetest: Check av_realloc() return code
2013-12-11 22:29:22 +01:00
.gitignore
Merge commit '3cd612d44789948f72b52944474e0870c5c60964'
2013-12-01 21:18:11 +01:00
arch.mak
…
Changelog
Merge commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c'
2013-12-12 19:55:06 +01:00
cmdutils_common_opts.h
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
2013-12-09 21:21:36 +01:00
cmdutils_opencl.c
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
2013-12-09 21:21:36 +01:00
cmdutils.c
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
2013-12-09 21:21:36 +01:00
cmdutils.h
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
2013-12-09 21:21:36 +01:00
common.mak
common.mak: Less ugly version of the previous windres fix
2013-12-09 02:47:55 +01:00
configure
Merge commit '7c3388711b7243d059db39aa04b754baf2156934'
2013-12-13 21:26:13 +01:00
COPYING.GPLv2
…
COPYING.GPLv3
…
COPYING.LGPLv2.1
…
COPYING.LGPLv3
…
CREDITS
…
ffmpeg_filter.c
Merge remote-tracking branch 'qatar/master'
2013-11-24 05:21:19 +01:00
ffmpeg_opt.c
Merge remote-tracking branch 'qatar/master'
2013-12-04 04:30:46 +01:00
ffmpeg_vdpau.c
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
2013-11-23 14:46:48 +01:00
ffmpeg.c
Merge commit '674fa49110a661694188a958be13d529b7c8c5dd'
2013-12-11 23:36:10 +01:00
ffmpeg.h
Merge commit '7671dd7cd7d51bbd637cc46d8f104a141bc355ea'
2013-11-23 14:46:48 +01:00
ffplay.c
Merge commit '84f131921ffb43d8070d5680e91f6a24d66ccac4'
2013-12-11 23:49:44 +01:00
ffprobe.c
ffprobe: add cosmetical empty line
2013-12-13 09:42:15 +01:00
ffserver.c
ffserver: improve error feedback in case of av_write_frame() error
2013-12-13 09:42:15 +01:00
INSTALL
…
library.mak
Add Windows resource file support for shared libraries
2013-12-05 23:42:07 +01:00
LICENSE
libavfilter/vf_noise: relicense to LGPL
2013-10-27 20:29:07 +00:00
MAINTAINERS
MAINTAINERS: remove ffserver maintainership status notice
2013-12-13 09:42:15 +01:00
Makefile
cmdutils & opencl: add -opencl_bench option to test and show available OpenCL devices
2013-12-09 21:21:36 +01:00
README
…
RELEASE
RELEASE: update to 2.1.git
2013-11-29 16:41:42 +01:00
version.sh
version.sh: add preprocessing guards
2013-11-30 21:42:03 +01:00

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
audiocffmpegffthevchlsmatroskamp4mpegmultimediartmprtspstreamingvideowebm
Readme 622 MiB
Languages
C 89%
Assembly 8.4%
Makefile 1.4%
GLSL 0.4%
C++ 0.3%
Other 0.2%