ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-23 14:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,114 Commits 36 Branches 398 Tags 536 MiB
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%
2d99de66b7
Go to file
Michael Niedermayer 2d99de66b7 Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756' 
* commit '3bfdee00cd92ff07c364d4901c4aefda32780756':
  x86: dcadsp: Fix linking with yasm and optimizations disabled

Conflicts:
	libavcodec/x86/dcadsp_init.c

See: 206167a295
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-06 14:10:27 +01:00
compat
doc Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
libavcodec Merge commit '3bfdee00cd92ff07c364d4901c4aefda32780756' 2014-03-06 14:10:27 +01:00
libavdevice lavd/avdevice: always free detected devices on error 2014-03-06 00:34:50 +01:00
libavfilter Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
libavformat Merge remote-tracking branch 'lukaszmluki/master' 2014-03-06 02:04:18 +01:00
libavresample
libavutil Revert "lavu/buffer: add release function" 2014-03-06 03:23:40 +01:00
libpostproc
libswresample
libswscale
presets
tests Merge commit 'e1f2987b10112489f6da5501d4c8735a798c9e3f' 2014-03-06 13:09:06 +01:00
tools Merge commit 'ea7f79f93796d68559a495be824b6bbd94dfe5f6' 2014-03-01 14:44:58 +01:00
.gitignore
arch.mak
Changelog Merge commit '599b81ca9a8e04a27ddad94af462171d16063167' 2014-03-06 13:07:20 +01:00
cmdutils_common_opts.h
cmdutils_opencl.c
cmdutils.c
cmdutils.h
common.mak
configure Merge commit '5ddc9f5052316608799b932c604f9e7561f8ce24' 2014-03-05 13:45:23 +01:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg_vdpau.c
ffmpeg.c ffmpeg: dont try to run the subtitle encoder on non subtitle streams 2014-03-03 21:06:24 +01:00
ffmpeg.h
ffplay.c
ffprobe.c
ffserver.c
INSTALL
library.mak
LICENSE
MAINTAINERS update for 2.2 2014-03-01 03:34:59 +01:00
Makefile
README
RELEASE RELEASE: update for 2.2 2014-03-01 17:09:12 +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.