ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-22 14:26:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,845 Commits 36 Branches 398 Tags 535 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
82070b01b8
Go to file
Michael Niedermayer 82070b01b8 Merge commit '9835abb6d63fb07613994ae90e72fef758149408' 
* commit '9835abb6d63fb07613994ae90e72fef758149408':
  network: uniform ff_listen_bind and ff_listen_connect

Conflicts:
	libavformat/network.c
	libavformat/tcp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-05 11:56:56 +02:00
compat os2threads: move from lavc to compat/ 2013-05-28 12:49:20 +02:00
doc Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e' 2013-06-05 11:19:16 +02:00
libavcodec pngdec: dont treat mpng like png with key and non keyframes 2013-06-04 20:40:07 +02:00
libavdevice lavd: add xv output device 2013-05-30 10:44:54 +02:00
libavfilter lavfi/mp: remove mp=sab 2013-06-05 00:06:51 +02:00
libavformat Merge commit '9835abb6d63fb07613994ae90e72fef758149408' 2013-06-05 11:56:56 +02:00
libavresample Merge commit '006ec64877fb638de4b15ae5fd969e22bd0f60ca' 2013-05-18 11:25:58 +02:00
libavutil Merge commit '3b4feac1ec14f861bdd7f494f288f4d8dd7f449e' 2013-06-05 11:19:16 +02:00
libpostproc postproc/postprocess_template: remove empty comments 2013-05-23 14:39:58 +02:00
libswresample swr: dont treat 32 and 24 as equal in simple copy check 2013-06-05 03:06:34 +02:00
libswscale Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 2013-06-03 11:53:05 +02:00
presets
tests avcodec/jpeg2000dwt: merge rescaling with interleave in 9/7 int IDWT 2013-06-03 13:24:20 +02:00
tools tools/qt-faststart: Fix unintended sign extension of current_offset 2013-06-02 23:10:44 +02:00
.gitignore Rename ffadler to ffhash and expand it using the generic hash API 2013-05-16 17:58:56 +02:00
arch.mak
Changelog Merge commit '2d66a58ccde05e764594bd7e5f0f9244634d0b2c' 2013-06-03 12:47:26 +02:00
cmdutils_common_opts.h
cmdutils.c cmdutils: print slice threading flag in -filters. 2013-05-24 15:34:37 +02:00
cmdutils.h
common.mak
configure lavfi: port sab filter from libmpcodecs 2013-06-05 00:06:51 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c ffmpeg: ignore EOF when pushing frames to filters. 2013-06-02 23:19:42 +02:00
ffmpeg.h
ffplay.c Use av_log() instead of fprintf() in ffplay. 2013-06-04 19:47:56 +02:00
ffprobe.c
ffserver.c ffserver: fix null pointer dereference 2013-06-04 13:19:27 +02:00
INSTALL
library.mak
LICENSE lavfi: port sab filter from libmpcodecs 2013-06-05 00:06:51 +02:00
MAINTAINERS tta encoder 2013-06-02 15:16:52 +00:00
Makefile Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d' 2013-05-24 13:01:41 +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.